Merge branch 'master' into v0.9

Conflicts:
	archaeological_warehouse/migrations/0020_generate_cache_lbl_for_containers.py

1 files changed, 5 insertions, 3 deletions

diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index 518610aa5..cd0dd4268 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -269,14 +269,16 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms,
             Q(history_creator=user)
 
     @classmethod
-    def get_owns(cls, user, menu_filtr=None, limit=None):
+    def get_owns(cls, user, menu_filtr=None, limit=None,
+                 values=None, get_short_menu_class=None):
         replace_query = None
         if menu_filtr and 'operation' in menu_filtr:
             replace_query = Q(operation=menu_filtr['operation'])
         owns = super(ContextRecord, cls).get_owns(
             user, replace_query=replace_query,
-            limit=limit)
-        return sorted(owns, key=lambda x: x.cached_label)
+            limit=limit, values=values,
+            get_short_menu_class=get_short_menu_class)
+        return cls._return_get_owns(owns, values, get_short_menu_class)
 
     def full_label(self):
         return unicode(self)