From: yomguy <yomguy@parisson.com>
Date: Wed, 1 Jun 2011 16:03:56 +0000 (+0200)
Subject: order item and collection querysets by code or old_code
X-Git-Tag: 1.1~140
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0814ce67b04fcc2a6252cac21ad74cc5b8a04343;p=telemeta.git

order item and collection querysets by code or old_code
---

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 31327439..d1ef9665 100644
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -212,7 +212,7 @@ class MediaCollection(MediaResource):
 class MediaCollectionForm(ModelForm):
     class Meta:
         model = MediaCollection
-
+        
 
 item_published_code_regex    = '[A-Za-z0-9._-]*'
 item_unpublished_code_regex  = '[A-Za-z0-9._-]*'
diff --git a/telemeta/models/query.py b/telemeta/models/query.py
index 26107bbe..628b117d 100644
--- a/telemeta/models/query.py
+++ b/telemeta/models/query.py
@@ -199,7 +199,7 @@ class MediaItemManager(CoreManager):
 
     def get_query_set(self):
         "Return media query sets"
-        return MediaItemQuerySet(self.model)
+        return MediaItemQuerySet(self.model).order_by('code', 'old_code')
 
     def enriched(self):
         "Query set with additional virtual fields such as apparent_collector and country_or_continent"
@@ -322,7 +322,7 @@ class MediaCollectionManager(CoreManager):
 
     def get_query_set(self):
         "Return the collection query"
-        return MediaCollectionQuerySet(self.model)
+        return MediaCollectionQuerySet(self.model).order_by('code')
 
     def enriched(self):
         "Query set with additional virtual fields such as apparent_collector"
diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py
index 74a3e6b9..a63a1309 100644
--- a/telemeta/templatetags/telemeta_utils.py
+++ b/telemeta/templatetags/telemeta_utils.py
@@ -296,10 +296,6 @@ def set_var(parser, token):
 def current_year():
     return datetime.datetime.now().strftime("%Y")
 
-@register.filter
-def sort_by_code(items):
-    return items.order_by('code')
-
 @register.filter
 def html_line_break(text):
     return text.replace('\n', '<br />')