Minor fixes.

[prawokultury.git] / migdal / views.py

diff --git a/migdal/views.py b/migdal/views.py
index 594444d..1f769a9 100644 (file)
--- a/migdal/views.py
+++ b/migdal/views.py
@@ -2,8 +2,10 @@
 # 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 django.http import Http404

 from django.shortcuts import get_object_or_404, render, redirect
 from django.utils.translation import get_language
 from django.shortcuts import get_object_or_404, render, redirect
 from django.utils.translation import get_language

+from fnpdjango.utils.views import set_current_object

 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


@@ -11,6 +13,14 @@ from migdal import app_settings
 from haystack.views import SearchView
 
 
 from haystack.views import SearchView
 
 

+def main(request):
+    if app_settings.MAIN_PAGE_ENTRY is not None:
+        main_entry = Entry.objects.get(**app_settings.MAIN_PAGE_ENTRY)
+        return entry(request, entry=main_entry)
+    else:
+        return entry_list(request)
+
+

 def entry_list(request, type_db=None, category_slug=None):
     lang = request.LANGUAGE_CODE
     templates = ["migdal/entry/entry_list.html"]
 def entry_list(request, type_db=None, category_slug=None):
     lang = request.LANGUAGE_CODE
     templates = ["migdal/entry/entry_list.html"]


@@ -30,6 +40,9 @@ def entry_list(request, type_db=None, category_slug=None):
     else:
         category = None
 
     else:
         category = None
 

+    if category:
+        set_current_object(request, 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 = 5 if entry_type is None and category is None else None
 
     object_list = api.entry_list(entry_type=entry_type, category=category,


@@ -43,14 +56,17 @@ def entry_list(request, type_db=None, category_slug=None):
         })
 
 
         })
 
 

-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
-    entry = get_object_or_404(Entry, **args)
+def entry(request, type_db=None, slug=None, entry=None):
+    if entry is None:
+        lang = request.LANGUAGE_CODE
+        args = {'type': type_db, 'slug_%s' % lang: slug}
+        entry = get_object_or_404(Entry, **args)
+    if not entry.published and not request.user.has_perm('migdal.change_entry'):
+        raise Http404
+    set_current_object(request, entry, in_url=slug is not None)

 
     templates = ["migdal/entry/entry_detail.html"]
 
     templates = ["migdal/entry/entry_detail.html"]

-    if type_db is not None:
+    if entry.type is not None:

         templates = ["migdal/entry/%s/entry_detail.html" % type_db] + templates
     return render(request, templates, {'entry': entry})
 
         templates = ["migdal/entry/%s/entry_detail.html" % type_db] + templates
     return render(request, templates, {'entry': entry})
 


@@ -80,7 +96,6 @@ class SearchPublishedView(SearchView):
         results = super(SearchPublishedView, self).get_results()
         lang_code = get_language()
         def is_published(entity):
         results = super(SearchPublishedView, self).get_results()
         lang_code = get_language()
         def is_published(entity):

-            print "is published? %s, %s" % (entity.published_pl, entity.published_en) 

             if isinstance(entity, Entry):
                 return getattr(entity, "published_%s" % lang_code) == True
             else:
             if isinstance(entity, Entry):
                 return getattr(entity, "published_%s" % lang_code) == True
             else: