summaryrefslogtreecommitdiff
path: root/ishtar_common/menu_base.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-09-11 11:28:40 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-09-11 11:28:40 +0200
commit9985406e7fd5d7561a79f5e9eeee36d007d66d76 (patch)
tree11edfe5030983edca12d2a46d189e72eda5027db /ishtar_common/menu_base.py
parentc75b9f076f8893a50713e75cffde1b757c320ebe (diff)
parentcc12bf5d9c20591d321f4461d2795a58fac07d1c (diff)
downloadIshtar-9985406e7fd5d7561a79f5e9eeee36d007d66d76.tar.bz2
Ishtar-9985406e7fd5d7561a79f5e9eeee36d007d66d76.zip
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/menu_base.py')
-rw-r--r--ishtar_common/menu_base.py4
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'):