X-Git-Url: https://git.mdrn.pl/prawokultury.git/blobdiff_plain/44090c986d9a16f6913047c25319c446bb9308ad..a133e0e8f7c0b89230c7520b2a56e2d7084ad29e:/migdal/api.py

diff --git a/migdal/api.py b/migdal/api.py
old mode 100755
new mode 100644
index 7ed17ec..fffbff8
--- a/migdal/api.py
+++ b/migdal/api.py
@@ -2,18 +2,26 @@
 # 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.settings import TYPES
+from migdal import app_settings
 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()
-    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:
-        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 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