diff options
| -rw-r--r-- | ishtar_common/models.py | 7 |
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): """ |