Fix permission check on IshtarUser instead of User

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