Browse Source

Fixed build

Rafał Pitoń 10 years ago
parent
commit
e517e26bf7
3 changed files with 13 additions and 8 deletions
  1. 5 2
      misago/acl/models.py
  2. 4 3
      misago/users/models/user.py
  3. 4 3
      misago/users/signatures.py

+ 5 - 2
misago/acl/models.py

@@ -32,8 +32,11 @@ class BaseRole(models.Model):
         try:
         try:
             return self.permissions_cache
             return self.permissions_cache
         except AttributeError:
         except AttributeError:
-            self.permissions_cache = serializer.loads(
-                self.pickled_permissions)
+            if self.pickled_permissions:
+                self.permissions_cache = serializer.loads(
+                    self.pickled_permissions)
+            else:
+               self.permissions_cache = {}
         return self.permissions_cache
         return self.permissions_cache
 
 
     @permissions.setter
     @permissions.setter

+ 4 - 3
misago/users/models/user.py

@@ -18,7 +18,8 @@ from misago.core.signals import secret_key_changed
 from misago.users.models.rank import Rank
 from misago.users.models.rank import Rank
 from misago.users import avatars
 from misago.users import avatars
 from misago.users.signals import delete_user_content, username_changed
 from misago.users.signals import delete_user_content, username_changed
-from misago.users.signatures import is_user_signature_valid, make_checksum
+from misago.users.signatures import (is_user_signature_valid,
+                                     make_signature_checksum)
 from misago.users.utils import hash_email
 from misago.users.utils import hash_email
 
 
 
 
@@ -436,6 +437,6 @@ Signal handlers
 def update_signatures_checksums(sender, **kwargs):
 def update_signatures_checksums(sender, **kwargs):
     for user in User.objects.iterator():
     for user in User.objects.iterator():
         if user.signature:
         if user.signature:
-            signature_checksum = make_checksum(user.signature_parsed, user)
-            user.signature_checksum = signature_checksum
+            new_checksum = make_signature_checksum(user.signature_parsed, user)
+            user.signature_checksum = new_checksum
             user.save(update_fields=['signature_checksum'])
             user.save(update_fields=['signature_checksum'])

+ 4 - 3
misago/users/signatures.py

@@ -6,7 +6,8 @@ def set_user_signature(user, signature):
 
 
     if signature:
     if signature:
         user.signature_parsed = signature_flavour(signature, user)
         user.signature_parsed = signature_flavour(signature, user)
-        user.signature_checksum = _make_checksum(user.signature_parsed, user)
+        user.signature_checksum = make_signature_checksum(
+            user.signature_parsed, user)
     else:
     else:
         user.signature_parsed = ''
         user.signature_parsed = ''
         user.signature_checksum = ''
         user.signature_checksum = ''
@@ -14,11 +15,11 @@ def set_user_signature(user, signature):
 
 
 def is_user_signature_valid(user):
 def is_user_signature_valid(user):
     if user.signature:
     if user.signature:
-        valid_checksum = _make_checksum(user.signature_parsed, user)
+        valid_checksum = make_signature_checksum(user.signature_parsed, user)
         return user.signature_checksum == valid_checksum
         return user.signature_checksum == valid_checksum
     else:
     else:
         return False
         return False
 
 
 
 
-def make_checksum(parsed_signature, user):
+def make_signature_checksum(parsed_signature, user):
     return checksums.make_checksum(parsed_signature, [user.pk])
     return checksums.make_checksum(parsed_signature, [user.pk])