sort related items by id on collection detail

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 1970bcb19458eb36acf1d9e1a6e56466c0370cbc..aa3214950f26f85060b9c6c06b59a1453769c01d 100644 (file)
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -152,6 +152,9 @@ class MediaCollection(Model, MediaCore):
           return False
         return True
 
+    def ordered_items(self):
+        return self.items.order_by('id', '_title')
+
     def __str__(self):
         #return self.title
         return self.id

diff --git a/telemeta/models/query.py b/telemeta/models/query.py
index 915b51651bee5e7619d60f0b8bab42175b89d6a7..184bdd2619f0ae56106b2d84e80157d0b1875e8e 100644 (file)
--- a/telemeta/models/query.py
+++ b/telemeta/models/query.py
@@ -140,6 +140,7 @@ class MediaItemQuerySet(CoreQuerySet):
             where = ["collection_id NOT IN (SELECT id FROM telemeta_collection)"]);
 
     def by_recording_date(self, pattern):
+        "Find items by recording date"
         return self.filter(Q(dates_enregistr__icontains=pattern) 
             | Q(annee_enreg__icontains=pattern))
 

diff --git a/telemeta/templates/collection_detail.html b/telemeta/templates/collection_detail.html
index 36957ad5014b6b0ba973cf51eb2d3ba23a154495..2b5d22532a46aa3147a750686544e1d5f11aa260 100644 (file)
--- a/telemeta/templates/collection_detail.html
+++ b/telemeta/templates/collection_detail.html
@@ -62,7 +62,7 @@
 
     <hr>
     <h4>Items</h4>
-    {% with object.items.all as items %}
+    {% with object.ordered_items as items %}
         {% include "inc/mediaitem_list.html" %}
     {% endwith %}
 {% else %}

diff --git a/telemeta/templates/collection_detail_dc.html b/telemeta/templates/collection_detail_dc.html
index a13db9dd7aa3f6c9012bb6f2a5b26347be138892..82f5b9d4e1ea110a7db70ea8e13294366ca3780c 100644 (file)
--- a/telemeta/templates/collection_detail_dc.html
+++ b/telemeta/templates/collection_detail_dc.html
@@ -22,7 +22,7 @@
             <td>{{ element.value }}</td></tr>
             {% endif %}
         {% endfor %}
-        {% for item in object.items.all %}
+        {% for item in object.ordered_items %}
             <tr><th>relation</th><td>hasPart</td><td>
             <a href="{% url telemeta-item-dublincore item.id|urlencode %}">
                 {{ item.id }}</a>

diff --git a/telemeta/templates/collection_xspf.xml b/telemeta/templates/collection_xspf.xml
index 41a0c19052de2eed483492528492debf8efab6d7..acc8a3cb54930e629432817b403136a46eeca7df 100644 (file)
--- a/telemeta/templates/collection_xspf.xml
+++ b/telemeta/templates/collection_xspf.xml
@@ -10,7 +10,7 @@
 {% endblock %}
 
 {% block tracklist %}
-{% for item in collection.items.all %}
+{% for item in collection.ordered_items %}
     <track>
       <title>{{ item.title }}</title>
       <meta rel="type">mp3</meta>

diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py
index f20186b98544e93b9193ab5ba7c0ed8be5197fbc..95a4a78d37a2b029ff52b9f79501ec83af054f9e 100644 (file)
--- a/telemeta/templatetags/telemeta_utils.py
+++ b/telemeta/templatetags/telemeta_utils.py
@@ -2,12 +2,6 @@ from django import template
 
 register = template.Library()
 
-
-#@register.filter
-#def cleanid(value):
-#    "Escapes a value for use in a URL (converts slashes)"
-#    return value.replace('/', '--')
-
 @register.filter
 def tolist(dict):
     "Converts a simple dict into a list"

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index eb358d82cb392ef8b93988eb22f4e17a093913b9..bef9c344191bf816b71bb3f75ac17f1eeb7bd5b4 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -165,13 +165,6 @@ class WebView(Component):
     def __get_admin_context_vars(self):
         return {"enumerations": self.__get_enumerations_list()}
 
-    def __continents_to_countries(self, tree):
-        countries = []
-        for continent in tree:
-            countries += continent['countries']
-        #countries.sort()
-        return countries
-
     def admin_index(self, request):
         return render_to_response('admin.html', self. __get_admin_context_vars())