summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-05-22 13:45:22 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-05-22 13:45:22 +0200
commit9d4873be602bd61d590d71df08946bc37a3d059e (patch)
tree0ca1f748abf9d2a1c23c7f295bd3b18840131abf /ishtar_common
parent93228b0de1dcf023c82f9b1e9cf59b482bbd98eb (diff)
downloadIshtar-9d4873be602bd61d590d71df08946bc37a3d059e.tar.bz2
Ishtar-9d4873be602bd61d590d71df08946bc37a3d059e.zip
Document templates: provide VAUES and KEYS for own template
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/models.py7
1 files changed, 4 insertions, 3 deletions
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):
"""