change item related "file" object denomination to "media"

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index 74ea26ecdd93a148745cfb3d784c7a762a8a2e66..f7f2c4beb1a305da28e92591a4ea431d4ee27977 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -276,7 +276,7 @@
         {% block related %}
         <div>
             <h4><a href="#">{% trans "Related media" %}</a></h4>
-            {% if related_files %}
+            {% if related_media %}
             <div>
                 <table class="instruments" width="100%">
                     <thead>
@@ -286,56 +286,56 @@
                         </tr>
                     </thead>
                     <tbody>
-                        {% for file in related_files %}
+                        {% for media in related_media %}
                         <tr>
                             <td style="font-size: 1em;">
                             <dl class="listing">
                                 <dt>{% trans "Title" %}</dt>
                                 <dd>
-                                    {% if file.url %}
-                                        <a href="{{ file.url }}" target="_blank">
-                                        {% if file.title %}
-                                            {{ file.title }}</a>
+                                    {% if media.url %}
+                                        <a href="{{ media.url }}" target="_blank">
+                                        {% if media.title %}
+                                            {{ media.title }}</a>
                                         {% else %}
-                                            {{ file.url|get_filename }}</a>
+                                            {{ media.url|get_filename }}</a>
                                         {% endif %}
                                     {% else %}
-                                        <a href="{% url telemeta-item-related-file item.public_id file.id %}" target="_blank">
-                                        {% if file.title %}
-                                            {{ file.title }}</a>
+                                        <a href="{% url telemeta-item-related item.public_id media.id %}" target="_blank">
+                                        {% if media.title %}
+                                            {{ media.title }}</a>
                                         {% else %}
-                                            {{ file.file|get_filename }}</a>
+                                            {{ media.file|get_filename }}</a>
                                         {% endif %} 
                                     {% endif %}
                                 </dd>
                                 <dt>{% trans "Description" %}</dt>
-                                <dd>{{ file.description|html_line_break|safe }}</dd>
-                                {% dl_field file "mime_type" %}
+                                <dd>{{ media.description|html_line_break|safe }}</dd>
+                                {% dl_field media "mime_type" %}
                                 <dt>{% trans "URL" %}</dt>
                                 <dd>
-                                {% if file.url %}
-                                    <a href="{{ file.url }}" target="_blank">{{ file.url }}</a>
+                                {% if media.url %}
+                                    <a href="{{ media.url }}" target="_blank">{{ media.url }}</a>
                                 {% else %}
-                                    <a href="{% url telemeta-item-related-file item.public_id file.id %}" target="_blank">
-                                        {% url telemeta-item-related-file item.public_id file.id %}
+                                    <a href="{% url telemeta-item-related item.public_id media.id %}" target="_blank">
+                                        {% url telemeta-item-related item.public_id media.id %}
                                     </a>
                                 {% endif %}
                                 </dd>
                             </dl>
                             </td>
 
-                            <td>{% if file.is_image %}
-                                  {% if file.url %}
-                                   <a href="{{ file.url }}">
-                                   <img src="{{ file.url }}" style="max-width: 420px; max-height: 200px;" /></a>
+                            <td>{% if media.is_image %}
+                                  {% if media.url %}
+                                   <a href="{{ media.url }}">
+                                   <img src="{{ media.url }}" style="max-width: 420px; max-height: 200px;" /></a>
                                   {% else %}
-                                   <a href="{% url telemeta-item-related-file item.public_id file.id %}">
-                                   <img src="{% url telemeta-item-related-file item.public_id file.id %}" style="max-width: 420px; max-height: 200px;" /></a>
+                                   <a href="{% url telemeta-item-related item.public_id media.id %}">
+                                   <img src="{% url telemeta-item-related item.public_id media.id %}" style="max-width: 420px; max-height: 200px;" /></a>
                                    {% endif %}
                                 {% else %}
-                                {% if file.url %}
-                                 {% if "youtube" in file.url %}
-                                 <iframe width="251" height="200" src="{{ file.url|get_youtube }}" frameborder="0" allowfullscreen></iframe>
+                                {% if media.url %}
+                                 {% if "youtube" in media.url %}
+                                 <iframe width="251" height="200" src="{{ media.url|get_youtube }}" frameborder="0" allowfullscreen></iframe>
                                  {% endif %}
                                 {% endif %}
                                 {% endif %}

diff --git a/telemeta/urls.py b/telemeta/urls.py
index 4c8595ce5621249d335047fa2070fb903fadea8b..103415bb03e77eac204716368e9274628a6baaa9 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -113,8 +113,8 @@ urlpatterns = patterns('',
     url(r'^items/(?P<public_id>[A-Za-z0-9._-]+)/keywords/$', item_view.item_keywords_edit,
         dict(template='telemeta/mediaitem_keywords_edit.html'), name="telemeta-item-keywords_edit"),
     url(r'^items/(?P<public_id>[A-Za-z0-9._-]+)/delete/$', item_view.item_delete, name="telemeta-item-delete"),
-    url(r'^items/(?P<item_public_id>[A-Za-z0-9._-]+)/related/(?P<file_id>[A-Za-z0-9._-]+)$', item_view.related_file_stream, name="telemeta-item-related-file"),
-    url(r'^items/(?P<public_id>[A-Za-z0-9._-]+)/related/$', item_view.related_file_edit,  dict(template='telemeta/mediaitem_related_edit.html'), name="telemeta-item-related_edit"),
+    url(r'^items/(?P<item_public_id>[A-Za-z0-9._-]+)/related/(?P<media_id>[A-Za-z0-9._-]+)$', item_view.related_media_stream, name="telemeta-item-related"),
+    url(r'^items/(?P<public_id>[A-Za-z0-9._-]+)/related_edit/$', item_view.related_media_edit,  dict(template='telemeta/mediaitem_related_edit.html'), name="telemeta-item-related_edit"),
     # Markers
     url(r'^markers/(?P<marker_id>[A-Za-z0-9]+)/$', item_view.item_detail, name="telemeta-item-detail-marker"),
         

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index a82b43b0d15cb0543d457adb2c26bfb4c6237951..ee974a4cc273b1f95dc47be5c213b3e0d210ebaf 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -510,8 +510,8 @@ class ItemView(object):
         public_access = get_public_access(item.public_access, str(item.recorded_from_date).split('-')[0], 
                                                 str(item.recorded_to_date).split('-')[0])
         
-        related_files = MediaItemRelated.objects.filter(item=item)
-        for file in related_files:
+        related_media = MediaItemRelated.objects.filter(item=item)
+        for file in related_media:
             if not file.mime_type:
                 file.set_mime_type()
                 file.save()
@@ -533,7 +533,7 @@ class ItemView(object):
                     'audio_export_enabled': getattr(settings, 'TELEMETA_DOWNLOAD_ENABLED', True),
                     'previous' : previous, 'next' : next, 'marker': marker_id, 'playlists' : playlists, 
                     'public_access': public_access, 'width': width, 'height': height, 
-                    'related_files': related_files, 
+                    'related_media': related_media, 
                     })
         
     @method_decorator(permission_required('telemeta.change_mediaitem'))
@@ -584,15 +584,15 @@ class ItemView(object):
                     'previous' : previous, 'next' : next, 
                     })
     
-    def related_file_stream(self, request, item_public_id, file_id):
+    def related_media_stream(self, request, item_public_id, media_id):
         item = MediaItem.objects.get(public_id=item_public_id)
-        file = MediaItemRelated.objects.get(item=item, id=file_id)
-        response = HttpResponse(stream_from_file(file.file.path), mimetype=file.mime_type)
+        media = MediaItemRelated.objects.get(item=item, id=media_id)
+        response = HttpResponse(stream_from_file(media.file.path), mimetype=media.mime_type)
 #        response['Content-Disposition'] = 'attachment'
         return response
     
     @method_decorator(permission_required('telemeta.change_mediaitem'))
-    def related_file_edit(self, request, public_id, template):
+    def related_media_edit(self, request, public_id, template):
         item = MediaItem.objects.get(public_id=public_id)
         MediaItemRelatedFormSet = inlineformset_factory(MediaItem, MediaItemRelated, form=MediaItemRelatedForm)
         if request.method == 'POST':