Merge branch 'master' of github.com:fnp/prawokultury

[prawokultury.git] / migdal / views.py

diff --git a/migdal/views.py b/migdal/views.py
index 42a2a39..befa950 100644 (file)
--- a/migdal/views.py
+++ b/migdal/views.py
@@ -6,7 +6,7 @@ from django.shortcuts import get_object_or_404, render, redirect
 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

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


@@ -14,13 +14,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 +28,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,