User roles error handling and fixtures

misago/forumroles/fixtures.py

@@ -1,42 +0,0 @@
-from misago.roles.models import Role
-from misago.utils import ugettext_lazy as _
-from misago.utils import get_msgid
-
-def load_fixtures():
-    role_admin = Role(
-                      name=_("Administrator").message,
-                      token='admin',
-                      protected=True,
-                      )
-    role_admin.set_permissions({
-                                'can_use_acp': True,
-                                'can_use_signature': True,
-                                })
-    
-    role_mod = Role(
-                    name=_("Moderator").message,
-                    token='mod',
-                    protected=True,
-                    )
-    role_admin.set_permissions({
-                                'can_use_signature': True,
-                                })
-    
-    role_registered = Role(
-                           name=_("Registered").message,
-                           token='registered',
-                           )
-    role_registered.set_permissions({
-                                     })
-    
-    role_guest = Role(
-                      name=_("Guest").message,
-                      token='guest',
-                      )
-    role_guest.set_permissions({
-                                })
-    
-    role_admin.save(force_insert=True)
-    role_mod.save(force_insert=True)
-    role_registered.save(force_insert=True)
-    role_guest.save(force_insert=True)    

misago/roles/fixtures.py

@@ -25,15 +25,13 @@ def load_fixtures():
                            name=_("Registered").message,
                            token='registered',
                            )
-    role_registered.set_permissions({
-                                     })
+    role_registered.set_permissions({})
     
     role_guest = Role(
                       name=_("Guest").message,
                       token='guest',
                       )
-    role_guest.set_permissions({
-                                })
+    role_guest.set_permissions({})
     
     role_admin.save(force_insert=True)
     role_mod.save(force_insert=True)

misago/users/models.py

@@ -56,7 +56,7 @@ class UserManager(models.Manager):
         try:
             from misago.ranks.models import Rank
             default_rank = Rank.objects.filter(special=0).order_by('order')[0]
-        except Rank.DoesNotExist:
+        except IndexError:
             default_rank = None
         
         # Store user in database