Changeset d082877


Ignore:
Timestamp:
11/10/11 11:58:58 (20 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

Location:
telemeta
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • telemeta/templates/telemeta_default/base.html

    r510ed41 rd082877  
    136136</div> 
    137137{% endblock layout %} 
     138 
     139{% block analytics %} 
     140{% endblock analytics %} 
     141 
    138142</body> 
    139143</html> 

  • telemeta/templates/telemeta_default/collection_detail.html

    r510ed41 rd082877  
    182182        {% endblock technical_data %} 
    183183        </div> 
    184         <h4>Items</h4> 
    185         {% with collection.items.enriched as items %} 
     184         
     185        <div class="extraInfos"> 
     186        <h4><img src="{% url telemeta-images "item_title.png" %}" style="vertical-align:middle" /> Items</h4> 
    186187        {% with "1" as location_name %} 
    187188            {% include "telemeta/inc/mediaitem_list.html" %} 
    188189        {% endwith %} 
    189         {% endwith %} 
    190         <!-- 
    191         {% with collection.ordered_items as items %} 
    192             {% include "telemeta/inc/mediaitem_list.html" %} 
    193         {% endwith %} 
    194         --> 
    195  
     190        </div> 
     191         
    196192        {% endblock infos %} 
    197193    </div> 

  • telemeta/web/base.py

    r053e10f rd082877  
    344344    def collection_detail(self, request, public_id, template='telemeta/collection_detail.html'): 
    345345        collection = MediaCollection.objects.get(public_id=public_id) 
     346        items = collection.items.enriched() 
     347        items = items.order_by('code', 'old_code') 
    346348         
    347349        if collection.public_access == 'none' and not (request.user.is_staff or request.user.is_superuser): 
    … …  
    355357                                                collection.recorded_to_year) 
    356358        playlists = get_playlists(request) 
    357         return render(request, template, {'collection': collection, 'playlists': playlists, 'public_access': public_access}) 
     359         
     360        return render(request, template, {'collection': collection, 'playlists': playlists, 'public_access': public_access, 'items': items}) 
    358361 
    359362    @method_decorator(permission_required('telemeta.change_mediacollection')) 
    … …  
    441444        pks = [] 
    442445        items = MediaItem.objects.filter(collection=item.collection) 
     446        items = items.order_by('code', 'old_code') 
     447         
    443448        if len(items) > 1: 
    444449            for it in items: 
    445450                pks.append(it.pk) 
    446             pks.sort() 
    447451            for pk in pks: 
    448452                if pk == item.pk: 
Note: See TracChangeset for help on using the changeset viewer.