Browse Source

small cleanup in threads list

Rafał Pitoń 9 years ago
parent
commit
71f3e5e5f5
2 changed files with 11 additions and 23 deletions
  1. 10 12
      misago/templates/misago/threadslist/base.html
  2. 1 11
      misago/threads/views/threadslist.py

+ 10 - 12
misago/templates/misago/threadslist/base.html

@@ -13,19 +13,17 @@
   <div class="container">
 
     {% block list-container %}
-      {% if show_toolbar %}
+      {% if category.subcategories %}
       <div class="toolbar">
-        {% if category.subcategories %}
-          <ul class="list-inline subcategories-list">
-            {% for subcategory in category.subcategories %}
-            <li>
-              <a href="{{ subcategory.get_absolute_url }}{% if list_type != 'all' %}{{ list_type }}/{% endif %}" class="subcategory {% if subcategory.css_class %}subcategory-{{ subcategory.css_class }}{% endif %}">
-                {{ subcategory.name }}
-              </a>
-            </li>
-            {% endfor %}
-          </ul>
-        {% endif %}
+        <ul class="list-inline subcategories-list">
+          {% for subcategory in category.subcategories %}
+          <li>
+            <a href="{{ subcategory.get_absolute_url }}{% if list_type != 'all' %}{{ list_type }}/{% endif %}" class="subcategory {% if subcategory.css_class %}subcategory-{{ subcategory.css_class }}{% endif %}">
+              {{ subcategory.name }}
+            </a>
+          </li>
+          {% endfor %}
+        </ul>
       </div>
       {% endif %}
 

+ 1 - 11
misago/threads/views/threadslist.py

@@ -88,15 +88,6 @@ class BaseList(View):
             if subcategory.pk in visible_subcategories:
                 category.subcategories.append(subcategory)
 
-        extra_context = self.get_extra_context(request)
-
-        show_toolbar = False
-        if paginator['count']:
-            if category.subcategories:
-                show_toolbar = True
-            if request.user.is_authenticated():
-                show_toolbar = True
-
         add_acl(request.user, page.object_list)
 
         request.frontend_context.update({
@@ -114,7 +105,6 @@ class BaseList(View):
 
         return render(request, self.template_name, dict(
             category=category,
-            show_toolbar=show_toolbar,
 
             list_type=list_type,
             list_name=LISTS_NAMES.get(list_type),
@@ -123,7 +113,7 @@ class BaseList(View):
             paginator=paginator,
             count=paginator['count'],
 
-            **extra_context
+            **self.get_extra_context(request)
         ))