Changeset d082877 for telemeta/web/base.py

Timestamp:

11/10/11 11:58:58 (19 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, dev2, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video

Children:

d4c2dd3, 482c7bd

Parents:

510ed41

git-author:

yomguy <yomguy@…> (11/10/11 11:58:58)

git-committer:

yomguy <yomguy@…> (11/10/11 11:58:58)

Message:

order item lists of collections by code and old_code, add analytics block to base.html

File:

• telemeta/web/base.py (modified) (3 diffs)

telemeta/web/base.py

@@ -344 +344 @@
     def collection_detail(self, request, public_id, template='telemeta/collection_detail.html'):
         collection = MediaCollection.objects.get(public_id=public_id)
+        items = collection.items.enriched()
+        items = items.order_by('code', 'old_code')
         
         if collection.public_access == 'none' and not (request.user.is_staff or request.user.is_superuser):
@@ -355 +357 @@
                                                 collection.recorded_to_year)
         playlists = get_playlists(request)
-        return render(request, template, {'collection': collection, 'playlists': playlists, 'public_access': public_access})
+        
+        return render(request, template, {'collection': collection, 'playlists': playlists, 'public_access': public_access, 'items': items})
 
     @method_decorator(permission_required('telemeta.change_mediacollection'))
@@ -441 +444 @@
         pks = []
         items = MediaItem.objects.filter(collection=item.collection)
+        items = items.order_by('code', 'old_code')
+        
         if len(items) > 1:
             for it in items:
                 pks.append(it.pk)
-            pks.sort()
             for pk in pks:
                 if pk == item.pk: