From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 28 Nov 2014 10:13:35 +0000 (+0100)
Subject: fix sorting
X-Git-Tag: 1.5.0rc2~13
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9da98ec86326417ce84df4cf42715c41d83b4a89;p=telemeta.git

fix sorting
---

diff --git a/telemeta/forms/media.py b/telemeta/forms/media.py
index 8120f726..12ea5173 100644
--- a/telemeta/forms/media.py
+++ b/telemeta/forms/media.py
@@ -43,8 +43,8 @@ from django.forms.widgets import HiddenInput
 
 class MediaFondsForm(ModelForm):
 
+    queryset = MediaCorpus.objects.all()
     widget = FilteredSelectMultiple("Corpus", True,)
-    queryset = queryset=MediaCorpus.objects.all()
     children = forms.ModelMultipleChoiceField(widget=widget, queryset=queryset, label='Corpus')
 
     class Meta:
diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 6f6dce0d..2a3875bf 100644
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -142,7 +142,6 @@ class MediaBaseResource(MediaResource):
 
     class Meta(MetaCore):
         abstract = True
-        ordering = ['code']
 
 
 class MediaRelated(MediaResource):
@@ -515,6 +514,7 @@ class MediaItem(MediaResource):
             return 0
     size.verbose_name = _('item size')
 
+
 class MediaItemRelated(MediaRelated):
     "Item related media"
 
@@ -795,10 +795,6 @@ class MediaCorpus(MediaBaseResource):
                 return True
         return False
 
-    @property
-    def sorted_children(self):
-        return self.children.order_by('code')
-
     def computed_duration(self):
         duration = Duration()
         for child in self.children.all():
@@ -810,6 +806,7 @@ class MediaCorpus(MediaBaseResource):
         db_table = 'media_corpus'
         verbose_name = _('corpus')
         verbose_name_plural = _('corpus')
+        ordering = ['code']
 
 
 class MediaFonds(MediaBaseResource):
@@ -834,10 +831,6 @@ class MediaFonds(MediaBaseResource):
                 return True
         return False
 
-    @property
-    def sorted_children(self):
-        return self.children.order_by('code')
-
     def computed_duration(self):
         duration = Duration()
         for child in self.children.all():
@@ -849,6 +842,7 @@ class MediaFonds(MediaBaseResource):
         db_table = 'media_fonds'
         verbose_name = _('fonds')
         verbose_name_plural = _('fonds')
+        ordering = ['code']
 
 
 class MediaCorpusRelated(MediaRelated):
diff --git a/telemeta/templates/telemeta/resource_detail.html b/telemeta/templates/telemeta/resource_detail.html
index e2bedd85..7bcc4a0c 100644
--- a/telemeta/templates/telemeta/resource_detail.html
+++ b/telemeta/templates/telemeta/resource_detail.html
@@ -99,7 +99,7 @@ jQuery(document).ready(function(){
 
         <div class="extraInfos">
         <h4><img src="{{ STATIC_URL }}telemeta/images/item_title.png" style="vertical-align:middle" />{{resource.children_type|capitalize }} </h4>
-        {% with resource.sorted_children.all as children %}
+        {% with resource.children.all as children %}
             {% include "telemeta/inc/children_list.html" %}
         {% endwith %}
         </div>