published only announces are displayed.
This commit is contained in:
parent
f9ea2f1212
commit
3aa4df5b82
|
@ -34,11 +34,9 @@ subscription_view = SubscriptionView.as_view()
|
|||
class AnnounceHomepageView(ListView):
|
||||
model = models.Announce
|
||||
template_name = 'portail_citoyen_announces/announce_homepage.html'
|
||||
transport_identifier = transports.HomepageTransport.identifier
|
||||
|
||||
def get_queryset(self):
|
||||
qs = models.Announce.objects.all()
|
||||
qs = qs.filter(category__subscription__transport=self.transport_identifier)
|
||||
qs = models.Announce.objects.all().published()
|
||||
if app_settings.feed_homepage_limit:
|
||||
qs = qs[:app_settings.feed_homepage_limit]
|
||||
return qs
|
||||
|
@ -46,10 +44,10 @@ class AnnounceHomepageView(ListView):
|
|||
def get_context_data(self, **kwargs):
|
||||
ctx = super(AnnounceHomepageView, self).get_context_data(**kwargs)
|
||||
ctx['id_prefix'] = 'announce-item-'
|
||||
subscriptions = models.Subscription.objects.filter(
|
||||
transport=self.transport_identifier,
|
||||
if self.request.user.is_authenticated():
|
||||
subscriptions = models.Subscription.objects.filter(
|
||||
user=self.request.user).select_related('category')
|
||||
ctx['subscriptions'] = [ sub.category.name for sub in subscriptions ]
|
||||
ctx['subscriptions'] = [ sub.category.name for sub in subscriptions ]
|
||||
return ctx
|
||||
|
||||
homepage_view = AnnounceHomepageView.as_view()
|
||||
|
@ -66,7 +64,7 @@ class AnnounceFeed(Feed):
|
|||
self.__dict__.update(kwargs)
|
||||
|
||||
def items(self):
|
||||
return models.Announce.objects.order_by('-publication_time')
|
||||
return models.Announce.objects.published().order_by('-publication_time')
|
||||
|
||||
def item_title(self, item):
|
||||
return item.title
|
||||
|
|
Reference in New Issue