fix no related media file

diff --git a/telemeta/templates/telemeta/inc/mediaitem_related.html b/telemeta/templates/telemeta/inc/mediaitem_related.html
index 9b2a980ec4b3e8ecc6e704e8d932fa0423411094..9bd7c9ea260df4262e02cde7b7a933bf079c5b52 100644 (file)
--- a/telemeta/templates/telemeta/inc/mediaitem_related.html
+++ b/telemeta/templates/telemeta/inc/mediaitem_related.html
@@ -22,18 +22,12 @@
                                 <dd>
                                     {% if media.url %}
                                         <a href="{{ media.url }}" target="_blank">
-                                        {% if media.title %}
-                                            {{ media.title }}</a>
-                                        {% else %}
-                                            {{ media.url|get_filename }}</a>
-                                        {% endif %}
+                                         {% firstof media.title media.url|get_filename '_' %}
+                                        </a>
                                     {% else %}
                                         <a href="{% url "telemeta-item-related" item.public_id media.id %}" target="_blank">
-                                        {% if media.title %}
-                                            {{ media.title }}</a>
-                                        {% else %}
-                                            {{ media.file|get_filename }}</a>
-                                        {% endif %}
+                                         {% firstof media.title media.file|get_filename '_' %}
+                                        </a>
                                     {% endif %}
                                 </dd>
                                 <dt>{% trans "Description" %}</dt>

diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py
index d0bf3a39633baa77c6109c8ae125807a7ea35f70..7cf3488f40edfdbec46634d7946f18d2f89c5ebd 100644 (file)
--- 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):