Browse Source

Fixed forums ACLs on forums lists

Rafał Pitoń 10 years ago
parent
commit
3f4ae72390
2 changed files with 3 additions and 6 deletions
  1. 1 5
      misago/core/views.py
  2. 2 1
      misago/forums/lists.py

+ 1 - 5
misago/core/views.py

@@ -1,15 +1,11 @@
 from django.shortcuts import render
 
-from misago.acl import add_acl
 from misago.forums.lists import get_forums_list
 from misago.users.online.ranks import get_ranks_online
 
 
 def forum_index(request):
-    forums_list = get_forums_list(request.user)
-    add_acl(request.user, forums_list)
-
     return render(request, 'misago/index.html', {
-        'categories': forums_list,
+        'categories': get_forums_list(request.user),
         'ranks_online': get_ranks_online(request.user),
     })

+ 2 - 1
misago/forums/lists.py

@@ -30,12 +30,13 @@ def get_forums_list(user, parent=None):
         if forum.level > parent_level:
             forums_dict[forum.parent_id].subforums.append(forum)
 
+    add_acl(user, forums_list)
+
     flat_list = []
     for forum in forums_list:
         if forum.role != "category" or forum.subforums:
             flat_list.append(forum)
 
-    add_acl(user, flat_list)
     return flat_list