summaryrefslogtreecommitdiff
path: root/ishtar_common/views.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-10-09 19:36:23 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-10-09 19:36:23 +0200
commit810a87e4b7e15d6ffe4b7b04538db264fb755318 (patch)
tree1033ed63c29b1b3209b7d4a36d8c5c85b4414926 /ishtar_common/views.py
parent3f9cd81a27874c39f5b96e2038daaedd02dbe4ec (diff)
downloadIshtar-810a87e4b7e15d6ffe4b7b04538db264fb755318.tar.bz2
Ishtar-810a87e4b7e15d6ffe4b7b04538db264fb755318.zip
Fix permission check on IshtarUser instead of User
Diffstat (limited to 'ishtar_common/views.py')
-rw-r--r--ishtar_common/views.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 00e5df7e1..8b3e3c488 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -306,9 +306,15 @@ def shortcut_menu(request):
items = []
current_items = []
labels[model_name] = {}
- for item, shortmenu_class in model.get_owns(
- request.user, menu_filtr=current_selected_item, limit=100,
- values=['id', 'cached_label'], get_short_menu_class=True):
+ lbl_key = "cached_label"
+ if model.SLUG == "warehouse":
+ lbl_key = "name"
+ values = ['id', lbl_key]
+
+ owns = model.get_owns(
+ request.user, menu_filtr=current_selected_item,
+ limit=100, values=values, get_short_menu_class=True) or []
+ for item, shortmenu_class in owns:
pk = unicode(item['id'])
if shortmenu_class == 'basket':
pk = "basket-" + pk