Update code

This commit is contained in:
Iacopo Spalletti 2016-06-05 22:50:26 +02:00
parent 3c4eebdd02
commit eab9083d90
No known key found for this signature in database
GPG key ID: BDCBC2EB289F60C6
3 changed files with 11 additions and 7 deletions

View file

@ -34,18 +34,17 @@ class Liveblog(AbstractText):
verbose_name_plural = _('liveblog entries') verbose_name_plural = _('liveblog entries')
def save(self, no_signals=False, *args, **kwargs): def save(self, no_signals=False, *args, **kwargs):
if not self.pk:
self.position = 0
saved = super(Liveblog, self).save(*args, **kwargs) saved = super(Liveblog, self).save(*args, **kwargs)
if self.publish: if self.publish:
self.send() self.send()
order = CMSPlugin.objects.filter(placeholder=self.placeholder).order_by('placeholder', 'path').values_list('pk', flat=True) order = CMSPlugin.objects.filter(placeholder=self.placeholder).order_by('placeholder', '-path').values_list('pk', flat=True)
reorder_plugins(self.placeholder, None, self.language, order) reorder_plugins(self.placeholder, None, self.language, order)
return saved return saved
@property @property
def liveblog_group(self): def liveblog_group(self):
post = Post.objects.language(self.language).filter(liveblog=self.placeholder).first() post = Post.objects.language(self.language).filter(liveblog=self.placeholder).first()
if post:
return post.liveblog_group return post.liveblog_group
def render(self): def render(self):
@ -61,6 +60,7 @@ class Liveblog(AbstractText):
'creation_date': self.creation_date.strftime(DATE_FORMAT), 'creation_date': self.creation_date.strftime(DATE_FORMAT),
'changed_date': self.changed_date.strftime(DATE_FORMAT), 'changed_date': self.changed_date.strftime(DATE_FORMAT),
} }
if self.liveblog_group:
Group(self.liveblog_group).send({ Group(self.liveblog_group).send({
'text': json.dumps(notification), 'text': json.dumps(notification),
}) })

View file

@ -21,6 +21,9 @@
</div> </div>
{% endif %} {% endif %}
{% endspaceless %} {% endspaceless %}
{% if view.liveblog_enabled %}
{% include "liveblog/includes/post_detail.html" %}
{% endif %}
{% if post.app_config.use_placeholder %} {% if post.app_config.use_placeholder %}
<div class="blog-content">{% render_placeholder post.content %}</div> <div class="blog-content">{% render_placeholder post.content %}</div>
{% else %} {% else %}

View file

@ -58,6 +58,7 @@ class BaseBlogView(AppConfigMixin, ViewUrlMixin):
except ImportError: except ImportError:
return False return False
class BaseBlogListView(BaseBlogView): class BaseBlogListView(BaseBlogView):
context_object_name = 'post_list' context_object_name = 'post_list'
base_template_name = 'post_list.html' base_template_name = 'post_list.html'