summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-04-18 11:40:32 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-04-18 11:54:42 +0200
commit4342d210342e83b6e9a7984cfa0b8ef3b7adc589 (patch)
tree996747f7b609ef6ed3dc71aabfa28d340199ba96
parent2a853f6383b972fbb2163b5e3dfc8812f2300b96 (diff)
downloadIshtar-4342d210342e83b6e9a7984cfa0b8ef3b7adc589.tar.bz2
Ishtar-4342d210342e83b6e9a7984cfa0b8ef3b7adc589.zip
Fix query for access control check
-rw-r--r--ishtar_common/models.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index d70bcd426..ea2f47af2 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -2768,21 +2768,21 @@ class Person(Address, Merge, OwnPerms, ValueGetter):
txt_idx__in=right_name).count()) or \
bool(self.person_types.filter(
groups__permissions__codename__in=right_name).count()) or\
- bool(self.ishtaruser.filter(
- groups__permissions__codename__in=right_name
+ bool(self.ishtaruser.groups.filter(
+ permissions__codename__in=right_name
).count()) or\
- bool(self.ishtaruser.filter(
- user_permissions__codename__in=right_name).count())
+ bool(self.ishtaruser.user_permissions.filter(
+ codename__in=right_name).count())
# or self.person_types.filter(wizard__url_name__in=right_name).count())
else:
res = bool(self.person_types.filter(txt_idx=right_name).count()) or \
bool(self.person_types.filter(
groups__permissions__codename=right_name).count()) or \
- bool(self.ishtaruser.filter(
- groups__permissions__codename__in=[right_name]
+ bool(self.ishtaruser.groups.filter(
+ permissions__codename__in=[right_name]
).count()) or\
- bool(self.ishtaruser.filter(
- user_permissions__codename__in=[right_name]).count())
+ bool(self.ishtaruser.user_permissions.filter(
+ codename__in=[right_name]).count())
# or self.person_types.filter(wizard__url_name=right_name).count())
if session:
cache.set(cache_key, res, settings.CACHE_SMALLTIMEOUT)