Ticket #674: img.diff

django/contrib/admin/templatetags/admin_list.py

@@ -149 +149 @@
             # ImageFields are special: Use a thumbnail.
             elif isinstance(f, meta.ImageField):
                 from django.parts.media.photos import get_thumbnail_url
-                result_repr = '<img src="%s" alt="%s" title="%s" />' % (get_thumbnail_url(getattr(result, 'get_%s_url' % f.name)(), '120'), field_val, field_val)
+                result_repr = '<img src="%s" alt="%s" title="%s" width="120px" />' % (get_thumbnail_url(getattr(result, 'get_%s_url' % f.name)(), '120'), field_val, field_val)
             # FloatFields are special: Zero-pad the decimals.
             elif isinstance(f, meta.FloatField):
                 if field_val is not None:

django/parts/media/photos.py

@@ -1 @@
-import re
-
+import re, os
+from django.conf.settings import MEDIA_URL
 def get_thumbnail_url(photo_url, width):
     bits = photo_url.split('/')
     bits[-1] = re.sub(r'(?i)\.(gif|jpg)$', '_t%s.\\1' % width, bits[-1])
-    return '/'.join(bits)
+    # check if thumbnail exists
+    if os.path.isfile(os.path.join(MEDIA_URL, *bits)):
+        return '/'.join(bits)
+    else:
+        return photo_url