Improve cached_label display

1 files changed, 7 insertions, 2 deletions

diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py
index 1088f3fea..55774ef04 100644
--- a/ishtar_common/context_processors.py
+++ b/ishtar_common/context_processors.py
@@ -21,7 +21,10 @@ from django.conf import settings
 from django.contrib.sites.models import Site
 from django.utils.translation import ugettext, ugettext_lazy as _
 
+from ishtar_common.utils import shortify
+
 from menus import Menu
+
 import models
 from archaeological_operations.models import Operation
 
@@ -61,8 +64,10 @@ def get_base_context(request):
         model_name = model.__name__.lower()
         current = model_name in request.session and request.session[model_name]
         items = []
-        for item in model.get_owns(request.user):
-            items.append((item.pk, unicode(item), unicode(item.pk) == current))
+        for item in sorted(model.get_owns(request.user),
+                           key=lambda x:x.cached_label):
+            items.append((item.pk, shortify(unicode(item), 60),
+                          unicode(item.pk) == current))
         if items:
             dct['current_menu'].append((lbl, model_name, items))
     return dct