Fixed ACL forms.

misago/acl/builder.py

@@ -6,14 +6,12 @@ from misago.models import Forum, ForumRole
 from misago.monitor import monitor
 
 class ACLFormBase(Form):
-    fieldsets = []
-
     def iterator(self):
         return FormIterator(self)
 
 
 def build_form(request, role):
-    form_type = type('ACLForm', (ACLFormBase,), {})
+    form_type = type('ACLFormFinal', (ACLFormBase,), {'fieldsets': []})
     for provider in settings.PERMISSION_PROVIDERS:
         app_module = import_module(provider)
         try:
@@ -24,7 +22,8 @@ def build_form(request, role):
 
 
 def build_forum_form(request, role):
-    form_type = type('ACLForm', (ACLFormBase,), {})
+    print dir(ACLFormBase)
+    form_type = type('ACLFormForumFinal', (ACLFormBase,), {'fieldsets': []})
     for provider in settings.PERMISSION_PROVIDERS:
         app_module = import_module(provider)
         try:

misago/acl/permissions/privatethreads.py

@@ -29,13 +29,13 @@ def make_form(request, role, form):
                                                                                       (2, _("Yes, hard-delete")),
                                                                                      ), coerce=int)
 
-        form.fieldset.append((
-                              _("Private Threads"),
-                              ('can_use_private_threads', 'can_start_private_threads',
-                               'can_upload_attachments_in_private_threads', 'private_thread_attachment_size',
-                               'private_thread_attachments_limit', 'can_invite_ignoring',
-                               'private_threads_mod', 'can_delete_checkpoints')
-                             ))
+        form.fieldsets.append((
+                               _("Private Threads"),
+                               ('can_use_private_threads', 'can_start_private_threads',
+                                'can_upload_attachments_in_private_threads', 'private_thread_attachment_size',
+                                'private_thread_attachments_limit', 'can_invite_ignoring',
+                                'private_threads_mod', 'can_delete_checkpoints')
+                              ))
 
 
 class PrivateThreadsACL(BaseACL):
@@ -45,10 +45,10 @@ class PrivateThreadsACL(BaseACL):
 
     def can_participate(self):
         return self.acl['can_use_private_threads']
-        
+
     def can_invite_ignoring(self):
         return self.acl['can_invite_ignoring']
-        
+
     def is_mod(self):
         return self.acl['private_threads_mod']
 

misago/acl/permissions/reports.py

@@ -20,10 +20,10 @@ def make_form(request, role, form):
                                                                                   (2, _("Yes, hard-delete")),
                                                                                  ), coerce=int)
 
-        form.fieldset.append((
-                              _("Reporting Content"),
-                              ('can_report_content', 'can_handle_reports', 'can_mod_reports_discussions', 'can_delete_reports')
-                             ))
+        form.fieldsets.append((
+                               _("Reporting Content"),
+                               ('can_report_content', 'can_handle_reports', 'can_mod_reports_discussions', 'can_delete_reports')
+                              ))
 
 
 class ReportsACL(BaseACL):
@@ -36,10 +36,10 @@ class ReportsACL(BaseACL):
 
     def can_handle(self):
         return self.acl['can_handle_reports']
-        
+
     def is_mod(self):
         return self.acl['can_mod_reports_discussions']
-        
+
     def can_delete(self):
         return self.acl['can_delete_reports']
 

misago/acl/permissions/search.py

@@ -10,10 +10,10 @@ def make_form(request, role, form):
                                                              help_text=_("Forum search can be resources intensive operation, and so its usually good idea to limit frequency of searches by requiring members to wait certain number of seconds before they can perform next search. Enter 0 to disable this requirement."),
                                                              initial=25, min_value=0)
 
-    form.fieldset.append((
-                          _("Searching"),
-                          ('can_search_forums', 'search_cooldown')
-                         ))
+    form.fieldsets.append((
+                           _("Searching"),
+                           ('can_search_forums', 'search_cooldown')
+                          ))
 
 
 class SearchACL(BaseACL):

misago/acl/permissions/usercp.py

@@ -20,10 +20,10 @@ def make_form(request, role, form):
         form.base_fields['allow_signature_images'] = forms.BooleanField(label=_("Can put images in signature"),
                                                                         widget=YesNoSwitch, initial=False, required=False)
 
-        form.fieldset.append((
-                              _("Profile Settings"),
-                              ('name_changes_allowed', 'changes_expire', 'can_use_signature', 'allow_signature_links', 'allow_signature_images')
-                             ))
+        form.fieldsets.append((
+                               _("Profile Settings"),
+                               ('name_changes_allowed', 'changes_expire', 'can_use_signature', 'allow_signature_links', 'allow_signature_images')
+                              ))
 
 
 class UserCPACL(BaseACL):

misago/apps/admin/widgets.py

@@ -291,7 +291,7 @@ class ListWidget(BaseWidget):
                             return redirect(self.get_link())
                     else:
                         message = Message(_("Search form contains errors."))
-                    message.type = 'error'
+                    message.level = messages.ERROR
                 else:
                     search_form = SearchForm(request=request)
 
@@ -315,7 +315,7 @@ class ListWidget(BaseWidget):
                 if table_form.is_valid():
                     message, redirect_link = self.table_action(items, table_form.cleaned_data)
                     if redirect_link:
-                        messages.add_message(request, message.type, message, self.admin.id)
+                        messages.add_message(request, message.level, message, self.admin.id)
                         return redirect(redirect_link)
                 else:
                     message = Message(table_form.non_field_errors()[0], messages.ERROR)
@@ -333,7 +333,7 @@ class ListWidget(BaseWidget):
                         form_action = getattr(self, 'action_' + list_form.cleaned_data['list_action'])
                         message, redirect_link = form_action(items, [int(x) for x in list_form.cleaned_data['list_items']])
                         if redirect_link:
-                            messages.add_message(request, message, message.type, self.admin.id)
+                            messages.add_message(request, message.level, message, self.admin.id)
                             return redirect(redirect_link)
                     except AttributeError:
                         message = Message(_("Requested action is incorrect."))
@@ -344,7 +344,7 @@ class ListWidget(BaseWidget):
                         message = Message(_("Requested action is incorrect."))
                     else:
                         message = Message(list_form.non_field_errors()[0])
-                message.type = 'error'
+                message.level = messages.ERROR
             else:
                 list_form = ListForm(request=request)
 
@@ -436,8 +436,8 @@ class FormWidget(BaseWidget):
             if form.is_valid():
                 try:
                     model, message = self.submit_form(form, model)
-                    if message.type != 'error':
-                        messages.add_message(request, message, message.type, self.admin.id)
+                    if message.level != messages.ERROR:
+                        messages.add_message(request, message.level, message, self.admin.id)
                         # Redirect back to right page
                         try:
                             if 'save_new' in request.POST and self.get_new_link:
@@ -507,7 +507,7 @@ class ButtonWidget(BaseWidget):
 
         # Do something
         message, url = self.action(model)
-        messages.add_message(request, message, message.type, self.admin.id)
+        messages.add_message(request, message.level, message, self.admin.id)
         if url:
             return redirect(url)
         return redirect(self.get_fallback_link())