fix related title again

diff --git a/telemeta/models/resource.py b/telemeta/models/resource.py
index f79c0b57fe3d668c85d34c05157df4d735eddc3b..b16cbd2491a70839ab33bd726b9d49c7170e382d 100644 (file)
--- a/telemeta/models/resource.py
+++ b/telemeta/models/resource.py
@@ -131,10 +131,13 @@ class MediaRelated(MediaResource):
 
     def __unicode__(self):
         if self.title and not re.match('^ *N *$', self.title):
-            title = self.title
+            return self.title
+        elif self.file:
+            return unicode(self.file.path.split(os.sep)[-1])
+        elif url:
+            return unicode(self.url.split('/')[-1])
         else:
-            title = unicode(self.item)
-        return title
+            return '_'
 
     class Meta:
         abstract = True

diff --git a/telemeta/templates/telemeta/inc/mediaitem_related.html b/telemeta/templates/telemeta/inc/mediaitem_related.html
index 9bd7c9ea260df4262e02cde7b7a933bf079c5b52..ff5bfd9585fc7afb411bccfe342a4e1186cb55c8 100644 (file)
--- a/telemeta/templates/telemeta/inc/mediaitem_related.html
+++ b/telemeta/templates/telemeta/inc/mediaitem_related.html
@@ -21,13 +21,9 @@
                                 <dt>{% trans "Title" %}</dt>
                                 <dd>
                                     {% if media.url %}
-                                        <a href="{{ media.url }}" target="_blank">
-                                         {% firstof media.title media.url|get_filename '_' %}
-                                        </a>
+                                        <a href="{{ media.url }}" target="_blank">{{ media }}</a>
                                     {% else %}
-                                        <a href="{% url "telemeta-item-related" item.public_id media.id %}" target="_blank">
-                                         {% firstof media.title media.file|get_filename '_' %}
-                                        </a>
+                                        <a href="{% url "telemeta-item-related" item.public_id media.id %}" target="_blank">{{ media }}</a>
                                     {% endif %}
                                 </dd>
                                 <dt>{% trans "Description" %}</dt>
@@ -38,9 +34,11 @@
                                 {% if media.file %}
                                 <dt>{% trans "Download" %}</dt>
                                 <dd>
+                                    {% if media.file %}
                                     <a href="{% url "telemeta-item-related-download" item.public_id media.id %}">
                                      {{ media.file|get_filename }}
                                     </a>
+                                    {% endif %}
                                 </dd>
                                 {% endif %}
                             </dl>