Changeset ed5ad88

Timestamp:

06/08/11 16:54:28 (2 years 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

Children:

a844b32

Parents:

db74edd (diff), 4a6a82a (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@…> (06/08/11 16:54:28)

git-committer:

yomguy <yomguy@…> (06/08/11 16:54:28)

Message:

fix no collection player when no rights

Files:

• telemeta/templates/telemeta_default/collection_detail.html (modified) (2 diffs)
• .bzrignore (added)
• telemeta/htdocs/timeside/js/controller.js (added)
• telemeta/htdocs/timeside/js/core.js (added)
• telemeta/htdocs/timeside/js/markerlist.js (added)
• telemeta/htdocs/timeside/js/soundprovider.js (added)
• telemeta/htdocs/timeside/js/util.js (added)
• telemeta/models/media.py (modified) (2 diffs)
• telemeta/templates/telemeta_default/mediaitem_detail.html (modified) (1 diff)

telemeta/templates/telemeta_default/collection_detail.html

@@ -74 +74 @@
 
 {% block content %}
-    <div class="{% if collection.has_mediafile %}with-rightcol{% endif %}">
+    <div class="{% if collection.has_mediafile %}{% if item.public_access == 'full' or public_access or user.is_staff %}with-rightcol{% endif %}{% endif %}">
         {% if collection.has_mediafile %}
+        {% if public_access or user.is_staff or user.is_superuser %}
         <div id="rightcol">
             <div id="collection_player">
@@ -99 +100 @@
         </div>
         {% endif %}
+        {% endif %}
       {% block infos %}
         <div class="intro">

telemeta/models/media.py

@@ -74 +74 @@
 
 
-collection_published_code_regex   = '[A-Za-z0-9._-]*'
-collection_unpublished_code_regex = '[A-Za-z0-9._-]*'
+collection_published_code_regex   = 'CNRSMH_E_[0-9]{4}(?:_[0-9]{3}){2}'
+collection_unpublished_code_regex = 'CNRSMH_I_[0-9]{4}_[0-9]{3}'
 collection_code_regex             = '(?:%s|%s)' % (collection_published_code_regex, 
                                                     collection_unpublished_code_regex)
@@ -218 +218 @@
         
 
-item_published_code_regex    = '[A-Za-z0-9._-]*'
-item_unpublished_code_regex  = '[A-Za-z0-9._-]*'
+item_published_code_regex    = collection_published_code_regex + '(?:_[0-9]{2,3}){1,2}'
+item_unpublished_code_regex  = collection_unpublished_code_regex + '_[0-9]{2,3}(?:_[0-9]{2,3}){0,2}'
 item_code_regex              = '(?:%s|%s)' % (item_published_code_regex, item_unpublished_code_regex)
 

telemeta/templates/telemeta_default/mediaitem_detail.html

@@ -259 +259 @@
     {% endblock infos %}
 </div> <!-- with-rightcol -->
-{% if user.is_authenticated and perms.telemeta.delete_mediaitem %}
-<div style="float: right;">
- <a href="{% url telemeta-item-delete item.public_id %}" class="component_icon button icon_delete">{% trans "Delete" %}</a>
-</div>
-{% endif %}
 {% endblock %}
 {% else %}