From 8de5ec6e68f6dbb37fdb194255681e1132fd66f7 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 22 May 2019 13:45:22 +0200 Subject: Document templates: provide VAUES and KEYS for own template --- ishtar_common/models.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ishtar_common/models.py') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 7e6b6c5fd..ed0f22121 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -142,7 +142,8 @@ class ValueGetter(object): if val.endswith('.None'): val = '' values[key] = val - if prefix: # do not provide KEYS and VALUES for sub-items + if not prefix or prefix == self._prefix: + # do not provide KEYS and VALUES for sub-items return values values['KEYS'] = u'\n'.join(values.keys()) value_list = [] @@ -305,8 +306,8 @@ class OwnPerms(object): if action_own_name == "view_own_findbasket": action_own_name = "view_own_find" return user.ishtaruser.has_right(action_name, request.session) or \ - (user.ishtaruser.has_right(action_own_name, request.session) - and self.is_own(user.ishtaruser)) + (user.ishtaruser.has_right(action_own_name, request.session) + and self.is_own(user.ishtaruser)) def is_own(self, user, alt_query_own=None): """ -- cgit v1.2.3