Refactored acl.special perms into acl.acp.

misago/acl/permissions/special.py → misago/acl/permissions/acp.py

@@ -5,16 +5,13 @@ from misago.forms import YesNoSwitch
 
 def make_form(request, role, form):
     if not role.special and request.user.is_god():
-        form.base_fields['can_use_mcp'] = forms.BooleanField(label=_("Can use Moderator Control Panel"),
-                                                             help_text=_("Change this permission to yes to grant access to Mod CP for users with this role."),
-                                                             widget=YesNoSwitch, initial=False, required=False)
         form.base_fields['can_use_acp'] = forms.BooleanField(label=_("Can use Admin Control Panel"),
                                                              help_text=_("Change this permission to yes to grant admin access for users with this role."),
                                                              widget=YesNoSwitch, initial=False, required=False)
 
         form.fieldsets.append((
-                               _("Special Access"),
-                               ('can_use_mcp', 'can_use_acp')
+                               _("Admin Control Panel"),
+                               ('can_use_acp',)
                               ))
 
 
@@ -22,23 +19,17 @@ class SpecialACL(BaseACL):
     def is_admin(self):
         return self.acl['can_use_acp']
 
-    def can_use_mcp(self):
-        return self.acl['can_use_mcp']
-
 
 def build(acl, roles):
-    acl.special = SpecialACL()
-    acl.special.acl['can_use_acp'] = False
-    acl.special.acl['can_use_mcp'] = False
+    acl.acp = SpecialACL()
+    acl.acp.acl['can_use_acp'] = False
 
     for role in roles:
         try:
             if role['can_use_acp']:
-                acl.special.acl['can_use_acp'] = True
-            if 'can_use_mcp' in role and role['can_use_mcp']:
-                acl.special.acl['can_use_mcp'] = True
+                acl.acp.acl['can_use_acp'] = True
         except KeyError:
             pass
 
-    if acl.special.acl['can_use_acp'] or acl.special.acl['can_use_mcp']:
+    if acl.acp.acl['can_use_acp']:
         acl.team = True

misago/firewalls.py

@@ -33,7 +33,7 @@ class FirewallAdmin(FirewallForum):
             # If we are not authenticated or not admin, force us to sign in right way
             if not request.user.is_authenticated():
                 return signin(request)
-            elif not request.user.is_god() and not request.acl.special.is_admin():
+            elif not request.user.is_god() and not request.acl.acp.is_admin():
                 request.messages.set_message(_("Your account does not have admin privileges"), messages.ERROR, 'security')
                 return signin(request)
             return None

misago/fixtures/userroles.py

@@ -9,7 +9,6 @@ def load():
                         'can_search_forums': True,
                         'search_cooldown': 0,
                         'can_use_acp': True,
-                        'can_use_mcp': True,
                         'can_use_signature': True,
                         'allow_signature_links': True,
                         'allow_signature_images': True,
@@ -41,7 +40,6 @@ def load():
                         'changes_expire': 14,
                         'can_search_forums': True,
                         'search_cooldown': 0,
-                        'can_use_mcp': True,
                         'can_use_signature': True,
                         'allow_signature_links': True,
                         'can_search_users': True,

misago/settings_base.py

@@ -146,7 +146,7 @@ PERMISSION_PROVIDERS = (
     'misago.acl.permissions.privatethreads',
     'misago.acl.permissions.reports',
     'misago.acl.permissions.destroyusers',
-    'misago.acl.permissions.special',
+    'misago.acl.permissions.acp',
 )
 
 # List of UserCP extensions