From b0b6ce7be840d6f6d8d17addb45b627e1e92c9e0 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 26 Aug 2017 21:59:27 -0400 Subject: [PATCH] When returning all permissions, return then as proxy (volatile) by default. Same behavior as all() with default arguments. Signed-off-by: Roberto Rosario --- mayan/apps/permissions/classes.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/mayan/apps/permissions/classes.py b/mayan/apps/permissions/classes.py index 637b724602..3f984ad85a 100644 --- a/mayan/apps/permissions/classes.py +++ b/mayan/apps/permissions/classes.py @@ -55,18 +55,14 @@ class Permission(object): @classmethod def all(cls, as_choices=False): if as_choices: - StoredPermission = apps.get_model( - app_label='permissions', model_name='StoredPermission' - ) - results = [] - for namespace, permissions in itertools.groupby(StoredPermission.objects.all(), lambda entry: entry.namespace): + for namespace, permissions in itertools.groupby(cls.all(), lambda entry: entry.namespace): permission_options = [ - (force_text(permission.pk), permission) for permission in permissions + (force_text(permission.uuid), permission) for permission in permissions ] results.append( - (PermissionNamespace.get(namespace), permission_options) + (namespace, permission_options) ) return results