From eaf1d20427d6d0a18690339692c470c0e575d39b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Thu, 13 Jul 2017 19:26:10 +0200 Subject: [PATCH] move q_for_request to AccessRestriction --- src/c3nav/mapdata/models/access.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/c3nav/mapdata/models/access.py b/src/c3nav/mapdata/models/access.py index 593c20ef..2a65a27e 100644 --- a/src/c3nav/mapdata/models/access.py +++ b/src/c3nav/mapdata/models/access.py @@ -21,6 +21,12 @@ class AccessRestriction(TitledMixin, models.Model): return cls.objects.all() return cls.objects.none() + @classmethod + def q_for_request(cls, request, prefix=''): + if request.user.is_authenticated and request.user.is_superuser: + return Q() + return Q(**{prefix + 'access_restriction__isnull': True}) + class AccessRestrictionMixin(SerializableMixin, models.Model): access_restriction = models.ForeignKey(AccessRestriction, null=True, blank=True, @@ -36,10 +42,4 @@ class AccessRestrictionMixin(SerializableMixin, models.Model): @classmethod def qs_for_request(cls, request): - return cls.objects.filter(cls.q_for_request(request)) - - @classmethod - def q_for_request(cls, request, prefix=''): - if request.user.is_authenticated and request.user.is_superuser: - return Q() - return Q(**{prefix+'access_restriction__isnull': True}) + return cls.objects.filter(AccessRestriction.q_for_request(request))