Changeset df36ae0


Ignore:
Timestamp:
24/06/2011 14:44:44 (3 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, dev, dev2, diadems, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, forma, generic, instru_search, lam, lam2, mapsv3, merge, nlivemulti, production, release/1.4.4, sabiod, security, server, social, storage, telecaster, test
Children:
a1fb48e
Parents:
350f781 (diff), 80c67b2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
yomguy <yomguy@…> (24/06/2011 14:44:44)
git-committer:
yomguy <yomguy@…> (24/06/2011 14:44:44)
Message:

yomguy 2011-06-24 fix collection title in playlist
yomguy 2011-06-24 add can_download_all_items perm, adapt media item view

Files:
6 added
3 edited

Legend:

Unmodified
Added
Removed
  • telemeta/models/media.py

    r4b01700 rdf36ae0  
    286286    class Meta(MetaCore): 
    287287        db_table = 'media_items' 
    288         permissions = ( 
    289                        ("can_play_all_items", "Can play all media items"),  
    290                        ) 
     288        permissions = (("can_play_all_items", "Can play all media items"),  
     289                       ("can_download_all_items", "Can download all media items"), ) 
    291290 
    292291    def is_valid_code(self, code): 
  • telemeta/templates/telemeta_default/home.html

    r4d0f2d9 r80c67b2  
    5959                {% endif %} 
    6060                {% if resource.type == "collection" and not resource.element == None %} 
    61                 <a href="{% url telemeta-collection-detail resource.element.public_id %}">{{ resource.element }}</a> 
     61                <a href="{% url telemeta-collection-detail resource.element.public_id %}">{% if resource.element.title %}{{ resource.element.title }}{% else %}{{ resource.element }}{% endif %}</a> 
    6262                {% endif %} 
    6363                {% if resource.type == "marker" and not resource.element == None  %} 
  • telemeta/templates/telemeta_default/mediaitem_detail.html

    ra0b0f45 rd64ce4e  
    126126        <!--</div>--> 
    127127 
    128         {% if audio_export_enabled or user.is_staff or user.is_superuser %} 
     128        {% if audio_export_enabled or perms.telemeta.can_download_all_items or user.is_superuser %} 
    129129        <div class="exporter"> 
    130130            <p><img src="{% url telemeta-images "download.png" %}" alt="download" style="vertical-align:middle" /> {% trans "Download:" %} 
Note: See TracChangeset for help on using the changeset viewer.