migration fix

[prawokultury.git] / migdal / views.py

diff --git a/migdal/views.py b/migdal/views.py
index 42a2a39..84cd6fe 100644 (file)
--- a/migdal/views.py
+++ b/migdal/views.py
@@ -3,10 +3,12 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.shortcuts import get_object_or_404, render, redirect
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.shortcuts import get_object_or_404, render, redirect

+from django.utils.translation import get_language

 from migdal import api
 from migdal.forms import get_submit_form
 from migdal.models import Category, Entry
 from migdal import api
 from migdal.forms import get_submit_form
 from migdal.models import Category, Entry

-from migdal.settings import TYPES_DICT, TYPES_ON_MAIN, TYPE_SUBMIT
+from migdal import app_settings
+from haystack.views import SearchView

 
 
 def entry_list(request, type_db=None, category_slug=None):
 
 
 def entry_list(request, type_db=None, category_slug=None):


@@ -14,13 +16,13 @@ def entry_list(request, type_db=None, category_slug=None):
     templates = ["migdal/entry/entry_list.html"]
 
     if type_db:
     templates = ["migdal/entry/entry_list.html"]
 
     if type_db:

-        if TYPES_ON_MAIN == (type_db,):
+        if app_settings.TYPES_ON_MAIN == (type_db,):

             return redirect('migdal_main')
             return redirect('migdal_main')

-        entry_type = TYPES_DICT[type_db]
+        entry_type = app_settings.TYPES_DICT[type_db]

         templates = ["migdal/entry/%s/entry_list.html" % type_db] + templates
         templates = ["migdal/entry/%s/entry_list.html" % type_db] + templates

-        submit = type_db == TYPE_SUBMIT
+        submit = type_db == app_settings.TYPE_SUBMIT

     else:
     else:

-        submit = TYPES_ON_MAIN == (TYPE_SUBMIT,)
+        submit = app_settings.TYPES_ON_MAIN == (app_settings.TYPE_SUBMIT,)

         entry_type = None
 
     if category_slug:
         entry_type = None
 
     if category_slug:


@@ -28,7 +30,10 @@ def entry_list(request, type_db=None, category_slug=None):
     else:
         category = None
 
     else:
         category = None
 

-    object_list = api.entry_list(entry_type=entry_type, category=category)
+    promobox = 5 if entry_type is None and category is None else None
+
+    object_list = api.entry_list(entry_type=entry_type, category=category,
+                    promobox=promobox)

 
     return render(request, templates, {
             'object_list': object_list,
 
     return render(request, templates, {
             'object_list': object_list,


@@ -40,8 +45,9 @@ def entry_list(request, type_db=None, category_slug=None):
 
 def entry(request, type_db, slug):
     lang = request.LANGUAGE_CODE
 
 def entry(request, type_db, slug):
     lang = request.LANGUAGE_CODE

-    args = {'type': type_db, 'slug_%s' % lang: slug, 'published_%s' % lang: True}
-    # TODO: preview for admins
+    args = {'type': type_db, 'slug_%s' % lang: slug}
+    if not request.user.has_perm('migdal.change_entry'):
+        args['published_%s' % lang] = True

     entry = get_object_or_404(Entry, **args)
 
     templates = ["migdal/entry/entry_detail.html"]
     entry = get_object_or_404(Entry, **args)
 
     templates = ["migdal/entry/entry_detail.html"]


@@ -64,4 +70,21 @@ def submit(request):
         })
 
 def submit_thanks(request):
         })
 
 def submit_thanks(request):

-    return render(request, "migdal/entry/submit_thanks.html")
\ No newline at end of file
+    return render(request, "migdal/entry/submit_thanks.html")
+
+
+class SearchPublishedView(SearchView):
+    def __init__(self, *args, **kwargs):
+        super(SearchPublishedView, self).__init__(*args, **kwargs)
+
+    def get_results(self):
+        results = super(SearchPublishedView, self).get_results()
+        lang_code = get_language()
+        def is_published(entity):
+            if isinstance(entity, Entry):
+                return getattr(entity, "published_%s" % lang_code) == True
+            else:
+                return True
+        results = filter(lambda r: is_published(r.object), results)
+        print results
+        return results