From efe82cde1e23783f3fdc4a52f5c6ca712e80352d Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 14 Jan 2013 23:19:08 -0400 Subject: [PATCH] Ignore StoredPermissions residing in the database that have no counterpart in the volatile permission set --- apps/permissions/models.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/permissions/models.py b/apps/permissions/models.py index b9d261c064..a308195842 100644 --- a/apps/permissions/models.py +++ b/apps/permissions/models.py @@ -137,7 +137,12 @@ class StoredPermission(models.Model): def __init__(self, *args, **kwargs): super(StoredPermission, self).__init__(*args, **kwargs) - self.volatile_permission = Permission.objects.get({'pk': '%s.%s' % (self.namespace, self.name)}, proxy_only=True) + try: + self.volatile_permission = Permission.objects.get({'pk': '%s.%s' % (self.namespace, self.name)}, proxy_only=True) + except Permission.DoesNotExist: + # Must be a deprecated permission in the database that is no + # longer used in the current code + pass def __unicode__(self): return unicode(getattr(self, 'volatile_permission', self.name))