New fnpdjango app with lots of common utils.

[prawokultury.git] / migdal / api.py

diff --git a/migdal/api.py b/migdal/api.py
old mode 100755 (executable)
new mode 100644 (file)
index 7ed17ec..d4f031e
--- a/migdal/api.py
+++ b/migdal/api.py
@@ -2,18 +2,27 @@
 # 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.models import Entry

-from migdal.settings import TYPES
+from migdal import app_settings

 from django.utils.translation import get_language
 
 
 from django.utils.translation import get_language
 
 

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

     lang = get_language()
     lang = get_language()

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

     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:

-        object_list = object_list.filter(type__in=[t.db for t in TYPES if t.on_main])
+        object_list = object_list.filter(
+            type__in=[t.db for t in app_settings.TYPES if t.on_main])

     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.promobox = promo
+

     return object_list
     return object_list