ACL decorator and exceptions

misago/acl/utils.py

@@ -0,0 +1,17 @@
+from misago.views import error403, error404
+
+class ACLError403(Exception):
+    pass
+
+class ACLError404(Exception):
+    pass
+
+def acl_errors(f):
+    def decorator(*args, **kwargs):
+        try:
+            return f(*args, **kwargs)
+        except ACLError403 as e:
+            return error403(args[0], e.message)
+        except ACLError404 as e:
+            return error404(args[0], e.message)
+    return decorator

misago/forums/acl.py

@@ -1,6 +1,7 @@
 from django.utils.translation import ugettext_lazy as _
 from django import forms
 from misago.acl.builder import BaseACL
+from misago.acl.utils import ACLError403, ACLError404
 from misago.forms import YesNoSwitch
 
 def make_forum_form(request, role, form):
@@ -23,15 +24,21 @@ class ForumsACL(BaseACL):
         try:
             return forum.pk in self.acl['can_see']
         except AttributeError:
-            return forum in self.acl['can_see']
+            return long(forum) in self.acl['can_see']
         
     def can_browse(self, forum):
         if self.can_see(forum):
             try:
-                return forum.pk in self.acl['can_see']
+                return forum.pk in self.acl['can_browse']
             except AttributeError:
-                return forum in self.acl['can_see']
+                return long(forum) in self.acl['can_browse']
         return False
+    
+    def check_forum(self, forum):
+        if not self.can_see(forum):
+            raise ACLError404()
+        if not self.can_browse(forum):
+            raise ACLError403(_("You can't browse this forum."))
 
 
 def build_forums(acl, perms, forums, forum_roles):