diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-12-15 18:46:58 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-12-15 18:46:58 +0100 |
| commit | f56bac69091bfc0ad48052e5102f60c0a574969a (patch) | |
| tree | 8f53e158404fdf429902679e1b9b38163b5c15a4 | |
| parent | ad087e96d28d048dd7e87cd82df6b9a05a47d73d (diff) | |
| download | Ishtar-f56bac69091bfc0ad48052e5102f60c0a574969a.tar.bz2 Ishtar-f56bac69091bfc0ad48052e5102f60c0a574969a.zip | |
Fix direct permissions management on Ishtar
| -rw-r--r-- | ishtar_common/models.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 73e5f82b1..20b8a6f46 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1987,12 +1987,22 @@ class Person(Address, Merge, OwnPerms, ValueGetter): res = bool(self.person_types.filter( txt_idx__in=right_name).count()) or \ bool(self.person_types.filter( - groups__permissions__codename__in=right_name).count()) + groups__permissions__codename__in=right_name).count()) or\ + bool(self.ishtaruser.filter( + groups__permissions__codename__in=right_name + ).count()) or\ + bool(self.ishtaruser.filter( + user_permissions__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()) + groups__permissions__codename=right_name).count()) or \ + bool(self.ishtaruser.filter( + groups__permissions__codename__in=right_name + ).count()) or\ + bool(self.ishtaruser.filter( + user_permissions__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) |