Browse Source

Tiny cleanup.

Ralfp 12 years ago
parent
commit
ca3229fd33
2 changed files with 4 additions and 10 deletions
  1. 1 3
      misago/apps/admin/ranks/views.py
  2. 3 7
      misago/apps/admin/users/views.py

+ 1 - 3
misago/apps/admin/ranks/views.py

@@ -145,9 +145,7 @@ class Edit(FormWidget):
         if self.request.user.is_god():
             target.roles.clear()
         else:
-            for role in target.roles.all():
-                if not role.protected:
-                    target.roles.remove(role)
+            target.roles.remove(*target.roles.filter(protected=False))
         for role in form.cleaned_data['roles']:
             target.roles.add(role)
 

+ 3 - 7
misago/apps/admin/users/views.py

@@ -338,14 +338,10 @@ class Edit(FormWidget):
         # Update user roles
         if self.request.user.is_god():
             target.roles.clear()
-            for role in form.cleaned_data['roles']:
-                target.roles.add(role)
         else:
-            for role in target.roles.all():
-                if not role.protected:
-                    target.roles.remove(role)
-            for role in form.cleaned_data['roles']:
-                target.roles.add(role)
+            target.roles.remove(*target.roles.filter(protected=False))
+        for role in form.cleaned_data['roles']:
+            target.roles.add(role)
 
         target.make_acl_key(True)
         target.save(force_update=True)