From eb1fb8511bec5da2bbaca929d4c459aadc3ff77f Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 5 Aug 2019 00:20:06 -0400 Subject: [PATCH] Move manager get code to ModelPermission class Signed-off-by: Roberto Rosario --- mayan/apps/acls/classes.py | 14 ++++++++++++++ mayan/apps/acls/managers.py | 13 +------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/mayan/apps/acls/classes.py b/mayan/apps/acls/classes.py index 5ba83b893f..867de95834 100644 --- a/mayan/apps/acls/classes.py +++ b/mayan/apps/acls/classes.py @@ -98,6 +98,20 @@ class ModelPermission(object): def get_inheritance(cls, model): return cls._inheritances[model] + @classmethod + def get_manager(cls, model): + try: + manager_name = cls.get_manager_name(model=model) + except KeyError: + manager_name = None + + if manager_name: + manager = getattr(model, manager_name) + else: + manager = model._meta.default_manager + + return manager + @classmethod def get_manager_name(cls, model): return cls._manager_names[model] diff --git a/mayan/apps/acls/managers.py b/mayan/apps/acls/managers.py index 1ff252f0ff..d66f280a7b 100644 --- a/mayan/apps/acls/managers.py +++ b/mayan/apps/acls/managers.py @@ -216,18 +216,7 @@ class AccessControlListManager(models.Manager): ) return True else: - try: - manager_name = ModelPermission.get_manager_name( - model=meta.model - ) - except KeyError: - manager_name = None - - if manager_name: - manager = getattr(obj._meta.model, manager_name) - else: - manager = obj._meta.default_manager - + manager = ModelPermission.get_manager(model=obj._meta.model) source_queryset = manager.all() restricted_queryset = manager.none()