diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-11 11:43:14 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-11 11:43:14 +0200 |
| commit | 9ebf429a92a8fa0dd04df6cdd51caa2ef1c58c39 (patch) | |
| tree | 3bbb30e8d51acc9d52083be6b21c2bdcfd2f5fdc /ishtar_common/menu_base.py | |
| parent | 73afc7f761b29a1404cdf567e1880816abcb96aa (diff) | |
| parent | 08f1fe99d11e40ca506469c1d782791fca18d49d (diff) | |
| download | Ishtar-9ebf429a92a8fa0dd04df6cdd51caa2ef1c58c39.tar.bz2 Ishtar-9ebf429a92a8fa0dd04df6cdd51caa2ef1c58c39.zip | |
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'ishtar_common/menu_base.py')
| -rw-r--r-- | ishtar_common/menu_base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/menu_base.py b/ishtar_common/menu_base.py index 7c309d376..64dfbae95 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) or\ + user.ishtaruser.has_perm(access_control, self.model, + session=session) or \ access_control in user.get_group_permissions(): - # session=session) or \ return True # manage by person type if hasattr(user, 'ishtaruser'): |