From fb59680910b5c694bdb481004ef10b15c1f9b06f Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 10 Nov 2011 14:01:18 +0100 Subject: [PATCH] change item related "file" object denomination to "media" --- .../telemeta_default/mediaitem_detail.html | 52 +++++++++---------- telemeta/urls.py | 4 +- telemeta/web/base.py | 14 ++--- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html index 74ea26ec..f7f2c4be 100644 --- a/telemeta/templates/telemeta_default/mediaitem_detail.html +++ b/telemeta/templates/telemeta_default/mediaitem_detail.html @@ -276,7 +276,7 @@ {% block related %}

{% trans "Related media" %}

- {% if related_files %} + {% if related_media %}
@@ -286,56 +286,56 @@ - {% for file in related_files %} + {% for media in related_media %} -
{% trans "Title" %}
- {% if file.url %} - - {% if file.title %} - {{ file.title }} + {% if media.url %} + + {% if media.title %} + {{ media.title }} {% else %} - {{ file.url|get_filename }} + {{ media.url|get_filename }} {% endif %} {% else %} - - {% if file.title %} - {{ file.title }} + + {% if media.title %} + {{ media.title }} {% else %} - {{ file.file|get_filename }} + {{ media.file|get_filename }} {% endif %} {% endif %}
{% trans "Description" %}
-
{{ file.description|html_line_break|safe }}
- {% dl_field file "mime_type" %} +
{{ media.description|html_line_break|safe }}
+ {% dl_field media "mime_type" %}
{% trans "URL" %}
- {% if file.url %} - {{ file.url }} + {% if media.url %} + {{ media.url }} {% else %} - - {% url telemeta-item-related-file item.public_id file.id %} + + {% url telemeta-item-related item.public_id media.id %} {% endif %}
{% if file.is_image %} - {% if file.url %} - - + {% if media.is_image %} + {% if media.url %} + + {% else %} - - + + {% endif %} {% else %} - {% if file.url %} - {% if "youtube" in file.url %} - + {% if media.url %} + {% if "youtube" in media.url %} + {% endif %} {% endif %} {% endif %} diff --git a/telemeta/urls.py b/telemeta/urls.py index 4c8595ce..103415bb 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -113,8 +113,8 @@ urlpatterns = patterns('', url(r'^items/(?P[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[A-Za-z0-9._-]+)/delete/$', item_view.item_delete, name="telemeta-item-delete"), - url(r'^items/(?P[A-Za-z0-9._-]+)/related/(?P[A-Za-z0-9._-]+)$', item_view.related_file_stream, name="telemeta-item-related-file"), - url(r'^items/(?P[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[A-Za-z0-9._-]+)/related/(?P[A-Za-z0-9._-]+)$', item_view.related_media_stream, name="telemeta-item-related"), + url(r'^items/(?P[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[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 a82b43b0..ee974a4c 100644 --- 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': -- 2.39.5