From a9c5caa9943ac77b4a3261e7ba1df6a6705ccf3c Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sun, 25 Dec 2011 03:15:41 -0400 Subject: [PATCH] Add the __str__ method and stored_permission proxy property to the Permission class --- apps/permissions/models.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/permissions/models.py b/apps/permissions/models.py index d823a2288b..6e1a7cafe5 100644 --- a/apps/permissions/models.py +++ b/apps/permissions/models.py @@ -67,7 +67,7 @@ class PermissionManager(object): def __init__(self, model): self.model = model - + class Permission(object): DoesNotExist = PermissionDoesNotExists @@ -81,9 +81,16 @@ class Permission(object): def __unicode__(self): return unicode(self.label) + def __str__(self): + return str(self.__unicode__()) + @property def uuid(self): return u'%s.%s' % (self.namespace.name, self.name) + + @property + def stored_permission(self): + return self.get_stored_permission() def get_stored_permission(self): stored_permission, created = StoredPermission.objects.get_or_create( @@ -101,8 +108,7 @@ class Permission(object): return stored_permission.requester_has_this(requester) def save(self, *args, **kwargs): - return self.get_stored_permission( - ) + return self.get_stored_permission() Permission.objects = PermissionManager(Permission) Permission._default_manager = Permission.objects