Shortcut menu: limit simple menu to 100 entries by types

2 files changed, 7 insertions, 3 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 5b93b62a2..ba3d51172 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -235,7 +235,7 @@ class OwnPerms:
         return cls.objects.filter(query).count()
 
     @classmethod
-    def get_owns(cls, user, replace_query={}):
+    def get_owns(cls, user, replace_query={}, limit=None):
         """
         Get Own items
         """
@@ -252,7 +252,10 @@ class OwnPerms:
         q = cls.objects.filter(query)
         if replace_query:
             q = cls.objects.filter(**replace_query)
-        items += list(q.order_by(*cls._meta.ordering).all())
+        if limit:
+            items += list(q.order_by('-pk')[:limit])
+        else:
+            items += list(q.order_by(*cls._meta.ordering).all())
         return items
 
 
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 6dc7e6e0d..3406cf7af 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -266,7 +266,8 @@ def shortcut_menu(request):
         current = model_name in request.session and request.session[model_name]
         items = []
         for item in model.get_owns(request.user,
-                                   menu_filtr=current_selected_item):
+                                   menu_filtr=current_selected_item,
+                                   limit=100):
             pk = unicode(item.pk)
             if item.IS_BASKET:
                 pk = "basket-" + pk