From 8ee8200e92bcdc54b51a0c56219763af78347a75 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Fri, 13 Mar 2015 18:07:08 +0100 Subject: [PATCH] fix no related media file --- .../templates/telemeta/inc/mediaitem_related.html | 14 ++++---------- telemeta/templatetags/telemeta_utils.py | 4 +++- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/telemeta/templates/telemeta/inc/mediaitem_related.html b/telemeta/templates/telemeta/inc/mediaitem_related.html index 9b2a980e..9bd7c9ea 100644 --- a/telemeta/templates/telemeta/inc/mediaitem_related.html +++ b/telemeta/templates/telemeta/inc/mediaitem_related.html @@ -22,18 +22,12 @@
{% if media.url %} - {% if media.title %} - {{ media.title }} - {% else %} - {{ media.url|get_filename }} - {% endif %} + {% firstof media.title media.url|get_filename '_' %} + {% else %} - {% if media.title %} - {{ media.title }} - {% else %} - {{ media.file|get_filename }} - {% endif %} + {% firstof media.title media.file|get_filename '_' %} + {% endif %}
{% trans "Description" %}
diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py index d0bf3a39..7cf3488f 100644 --- a/telemeta/templatetags/telemeta_utils.py +++ b/telemeta/templatetags/telemeta_utils.py @@ -366,8 +366,10 @@ def to_string(list): def get_filename(object): if isinstance(object, unicode): return object.split('/')[-1] - else: + elif object.path: return object.path.split(os.sep)[-1] + else: + return '' @register.filter def get_youtube(link): -- 2.39.5