Dropped DEFAULT_PERMISSIONS

misago/acl/forms.py

@@ -21,12 +21,6 @@ def get_permissions_forms(role, data=None):
     forms = []
     for provider, module in providers.list():
         try:
-            default_data = module.DEFAULT_PERMISSIONS
-        except AttributeError:
-            message = "'%s' object has no attribute '%s'"
-            raise AttributeError(
-                message % (provider, 'DEFAULT_PERMISSIONS'))
-        try:
             module.change_permissions_form
         except AttributeError:
             message = "'%s' object has no attribute '%s'"
@@ -39,8 +33,7 @@ def get_permissions_forms(role, data=None):
             if data:
                 forms.append(FormType(data, prefix=provider))
             else:
-                initial_data = role_permissions.get(provider, default_data)
-                forms.append(FormType(initial=initial_data,
+                forms.append(FormType(initial=role_permissions.get(provider),
                                       prefix=provider))
 
     return forms

misago/core/forms.py

@@ -13,6 +13,11 @@ def YesNoSwitch(**kwargs):
     if 'initial' not in kwargs:
         kwargs['initial'] = 0
 
+    if kwargs['initial'] == True:
+        kwargs['initial'] = 1
+    if kwargs['initial'] == False:
+        kwargs['initial'] = 0
+
     return TypedChoiceField(
         coerce=int,
         choices=((1, _("Yes")), (0, _("No"))),

misago/forums/permissions.py

@@ -3,12 +3,6 @@ from misago.core import forms
 from misago.forums.models import ForumRole
 
 
-DEFAULT_PERMISSIONS = {
-    'can_see': False,
-    'can_browse': False
-}
-
-
 """
 Admin Permissions Form
 """

misago/users/permissions/account.py

@@ -3,15 +3,6 @@ from misago.acl.models import Role
 from misago.core import forms
 
 
-DEFAULT_PERMISSIONS = {
-    'name_changes_allowed': 1,
-    'changes_expire': 0,
-    'can_use_signature': True,
-    'allow_signature_links': True,
-    'allow_signature_images': False,
-}
-
-
 """
 Admin Permissions Form
 """
@@ -33,7 +24,8 @@ class PermissionsForm(forms.Form):
         label=_("Can put links in signature"),
         initial=True)
     allow_signature_images = forms.YesNoSwitch(
-        label=_("Can put images in signature"))
+        label=_("Can put images in signature"),
+        initial=False)
 
 
 def change_permissions_form(role):

misago/users/permissions/destroying.py

@@ -3,12 +3,6 @@ from misago.acl.models import Role
 from misago.core import forms
 
 
-DEFAULT_PERMISSIONS = {
-    'can_destroy_user_newer_than': 0,
-    'can_destroy_users_with_less_posts_than': 0,
-}
-
-
 """
 Admin Permissions Form
 """
@@ -17,11 +11,13 @@ class PermissionsForm(forms.Form):
     can_destroy_user_newer_than = forms.IntegerField(
         label=_("Maximum age of destroyed account (in days)"),
         help_text=_("Enter zero to disable this check."),
-        min_value=0)
+        min_value=0,
+        initial=0)
     can_destroy_users_with_less_posts_than = forms.IntegerField(
         label=_("Maximum number of posts on destroyed account"),
         help_text=_("Enter zero to disable this check."),
-        min_value=0)
+        min_value=0,
+        initial=0)
 
 
 def change_permissions_form(role):

misago/users/permissions/profiles.py

@@ -3,21 +3,14 @@ from misago.acl.models import Role
 from misago.core import forms
 
 
-DEFAULT_PERMISSIONS = {
-    'can_search_users': True,
-    'can_see_users_emails': False,
-    'can_see_users_ips': False,
-    'can_see_hidden_users': False,
-}
-
-
 """
 Admin Permissions Form
 """
 class PermissionsForm(forms.Form):
     legend = _("User profiles")
     can_search_users = forms.YesNoSwitch(
-        label=_("Can search user profiles"))
+        label=_("Can search user profiles"),
+        initial=True)
     can_see_users_emails = forms.YesNoSwitch(
         label=_("Can see members e-mails"))
     can_see_users_ips = forms.YesNoSwitch(