Browse Source

another small cleanup

Rafał Pitoń 9 years ago
parent
commit
c1ba1c39b7

+ 0 - 7
misago/threads/api/threadendpoints/lists.py

@@ -96,13 +96,6 @@ class ThreadsListEndpoint(BaseListEndpoint):
             raise Http404()
         return categories[0]
 
-    def get_subcategories(self, category, categories):
-        subcategories = []
-        for subcategory in categories:
-            if category.has_child(subcategory):
-                subcategories.append(subcategory)
-        return subcategories
-
     def get_pinned_threads(self, category, queryset, threads_categories):
         if category.level:
             return list(queryset.filter(weight=2)) + list(queryset.filter(

+ 7 - 0
misago/threads/mixins/threadslists.py

@@ -39,6 +39,13 @@ class ThreadsListMixin(object):
                 id__in=request.user.acl['visible_categories']
             ).select_related('parent'))
 
+    def get_subcategories(self, category, categories):
+        subcategories = []
+        for subcategory in categories:
+            if category.has_child(subcategory):
+                subcategories.append(subcategory)
+        return subcategories
+
     def get_visible_subcategories(self, threads, threads_categories):
         visible_subcategories = []
         for thread in threads:

+ 3 - 10
misago/threads/views/lists.py

@@ -102,13 +102,6 @@ class BaseList(View):
             **self.get_extra_context(request)
         ))
 
-    def get_subcategories(self, category, categories):
-        subcategories = []
-        for subcategory in categories:
-            if category.has_child(subcategory):
-                subcategories.append(subcategory)
-        return subcategories
-
     def get_pinned_threads(self, request, queryset):
         return []
 
@@ -184,13 +177,13 @@ class PrivateThreadsList(ThreadsList):
     template_name = 'misago/threadslist/private_threads.html'
     preloaded_data_prefix = 'PRIVATE_'
 
+    def get_categories(self, request):
+        return [Category.objects.private_threads()]
+
     def get_category(self, request, **kwargs):
         allow_use_private_threads(request.user)
         return Category.objects.private_threads()
 
-    def get_categories(self, request):
-        return [Category.objects.private_threads()]
-
     def get_subcategories(self, category, categories):
         return []