Просмотр исходного кода

fix forum threads list title on forum index

Rafał Pitoń 9 лет назад
Родитель
Сommit
936f928051

+ 2 - 0
misago/conf/context_processors.py

@@ -10,6 +10,7 @@ def settings(request):
         'misago_settings': db_settings,
 
         'CATEGORIES_ON_INDEX': dj_settings.MISAGO_CATEGORIES_ON_INDEX,
+        'THREADS_ON_INDEX': not dj_settings.MISAGO_CATEGORIES_ON_INDEX,
 
         'LOGIN_REDIRECT_URL': dj_settings.LOGIN_REDIRECT_URL,
         'LOGIN_URL': dj_settings.LOGIN_URL,
@@ -38,6 +39,7 @@ def preload_settings_json(request):
         'CSRF_COOKIE_NAME': dj_settings.CSRF_COOKIE_NAME,
 
         'CATEGORIES_ON_INDEX': dj_settings.MISAGO_CATEGORIES_ON_INDEX,
+        'THREADS_ON_INDEX': not dj_settings.MISAGO_CATEGORIES_ON_INDEX,
     })
 
     return {}

+ 4 - 4
misago/templates/misago/threadslist/threads.html

@@ -9,7 +9,7 @@
   {% else %}
     {{ list_name }} | {% trans "Threads" %} | {{ block.super }}
   {% endif %}
-{% elif is_index and paginator.page == 1 %}
+{% elif THREADS_ON_INDEX and paginator.page == 1 %}
   {% if misago_settings.forum_index_title %}
     {{ misago_settings.forum_index_title }}
   {% else %}
@@ -17,7 +17,7 @@
   {% endif %}
 {% elif paginator.page > 1 %}
   {% trans "Threads" %} ({% blocktrans with page=paginator.page %}page: {{ page }}{% endblocktrans %}) | {{ block.super }}
-{% elif is_index %}
+{% elif THREADS_ON_INDEX %}
   {{ block.super }}
 {% else %}
   {% trans "Threads" %} | {{ block.super }}
@@ -26,7 +26,7 @@
 
 
 {% block meta-description %}
-{% if is_index and misago_settings.forum_index_meta_description %}
+{% if THREADS_ON_INDEX and misago_settings.forum_index_meta_description %}
   {{ misago_settings.forum_index_meta_description }}
 {% endif %}
 {% endblock meta-description %}
@@ -35,7 +35,7 @@
 {% block page-header %}
 <div class="page-header {{ user.is_authenticated|iftrue:"tabbed" }}">
   <div class="container">
-    {% if is_index %}
+    {% if THREADS_ON_INDEX %}
       {% if misago_settings.forum_index_title %}
         <h1>{{ misago_settings.forum_index_title }}</h1>
       {% else %}

+ 8 - 4
misago/threads/views/list.py

@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.http import Http404
 from django.shortcuts import render
@@ -34,9 +35,6 @@ class ListBase(View):
     def get_threads(self, request, category, list_type, page):
         return self.threads(request, category, list_type, page)
 
-    def get_default_frontend_context(self):
-        return {}
-
     def get_frontend_context(self, request, category, threads):
         context = self.get_default_frontend_context()
 
@@ -45,14 +43,20 @@ class ListBase(View):
 
         return context
 
+    def get_default_frontend_context(self):
+        return {}
+
     def get_template_context(self, request, category, threads):
-        context = {}
+        context = self.get_default_template_context()
 
         context.update(category.get_template_context())
         context.update(threads.get_template_context())
 
         return context
 
+    def get_default_template_context(self):
+        return {}
+
 
 class ForumThreads(ListBase):
     category = ThreadsRootCategory