diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-03 22:23:46 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-03 22:23:46 +0200 |
| commit | fc835921567bde864b158f0a26a9461334b8facd (patch) | |
| tree | 15c53d3ee13d79e72be949dc98d5c31195338a59 /ishtar_common/menu_base.py | |
| parent | 7f481fdfc8ce76e70bb4496c63770f8b5a9255b6 (diff) | |
| parent | ba25fffca393f1a92d9e91422532a1da177b9e97 (diff) | |
| download | Ishtar-fc835921567bde864b158f0a26a9461334b8facd.tar.bz2 Ishtar-fc835921567bde864b158f0a26a9461334b8facd.zip | |
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'ishtar_common/menu_base.py')
| -rw-r--r-- | ishtar_common/menu_base.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ishtar_common/menu_base.py b/ishtar_common/menu_base.py index d8ee0775c..7c309d376 100644 --- a/ishtar_common/menu_base.py +++ b/ishtar_common/menu_base.py @@ -89,9 +89,9 @@ class MenuItem: for access_control in self.access_controls: access_control = prefix + access_control if hasattr(user, 'ishtaruser') and \ - user.ishtaruser.has_perm(access_control, self.model, - session=session) or \ + user.ishtaruser.has_perm(access_control, self.model) or\ access_control in user.get_group_permissions(): + # session=session) or \ return True # manage by person type if hasattr(user, 'ishtaruser'): @@ -107,8 +107,8 @@ class MenuItem: prefix = (self.model._meta.app_label + '.') if self.model else '' for access_control in self.access_controls: access_control = prefix + access_control - if user.has_perm(access_control, self.model, obj=obj, - session=session): + if user.has_perm(access_control, self.model, obj=obj): + # session=session): return True # manage by person type if hasattr(user, 'ishtaruser'): |