fix for django 1.10 (= in template)

[django-migdal.git] / migdal / api.py

diff --git a/migdal/api.py b/migdal/api.py
index d4f031e..fd89352 100644 (file)
--- a/migdal/api.py
+++ b/migdal/api.py
@@ -2,16 +2,20 @@
 # This file is part of PrawoKultury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of PrawoKultury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from itertools import chain

 from migdal.models import Entry
 from migdal import app_settings
 from django.utils.translation import get_language
 
 
 from migdal.models import Entry
 from migdal import app_settings
 from django.utils.translation import get_language
 
 

-def entry_list(entry_type=None, category=None, promobox=False):
+def entry_list(entry_type=None, category=None, promobox=False, for_feed=False):

     lang = get_language()
     lang = get_language()

-    object_list = Entry.objects.filter(**{"published_%s" % lang: True}
-        ).order_by('-published_at_%s' % lang)
+    object_list = Entry.objects.filter(**{"published_%s" % lang: True})
+
+    if for_feed:
+        object_list = object_list.order_by('-published_at_%s' % lang)
+    else:
+        object_list = object_list.order_by('-first_published_at')
+

     if entry_type:
         object_list = object_list.filter(type=entry_type.db)
     else:
     if entry_type:
         object_list = object_list.filter(type=entry_type.db)
     else:


@@ -20,9 +24,11 @@ def entry_list(entry_type=None, category=None, promobox=False):
     if category:
         object_list = object_list.filter(categories=category)
 
     if category:
         object_list = object_list.filter(categories=category)
 

+    object_list = object_list.filter(in_stream=True)
+

     if promobox:
         promo = list(object_list.filter(promo=True)[:promobox])
     if promobox:
         promo = list(object_list.filter(promo=True)[:promobox])

-        #object_list = object_list.exclude(pk__in=[p.pk for p in promo])
+        # object_list = object_list.exclude(pk__in=[p.pk for p in promo])

         object_list.promobox = promo
 
     return object_list
         object_list.promobox = promo
 
     return object_list