order item and collection querysets by code or old_code

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 313274396abfb253a9d40098bbe4763c6d222206..d1ef966599cb9a3a95630824503269e728fb4d5a 100644 (file)
--- 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 26107bbebf4cecae9c6e697735339da67f2df6d5..628b117d94f863cf0346adbae131f355d2c2d477 100644 (file)
--- 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 74a3e6b972d2e7c743f9c4135e198f4779b724ac..a63a13090cdbfe70e6fda45d163e03818b0d6b9a 100644 (file)
--- 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 />')