version 0.5

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

diff --git a/migdal/api.py b/migdal/api.py
index abd3b21..fd89352 100644 (file)
--- a/migdal/api.py
+++ b/migdal/api.py
@@ -2,14 +2,12 @@
 # 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,
-            for_feed=False):
+def entry_list(entry_type=None, category=None, promobox=False, for_feed=False):

     lang = get_language()
     object_list = Entry.objects.filter(**{"published_%s" % lang: True})
 
     lang = get_language()
     object_list = Entry.objects.filter(**{"published_%s" % lang: True})
 


@@ -26,13 +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)
 

-    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.filter(in_stream=True)
 
     if promobox:
     object_list = object_list.filter(in_stream=True)
 
     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.promobox = promo
 
     return object_list
         object_list.promobox = promo
 
     return object_list