From e03edf8e83209bede13d89dfe84c10592c8b4849 Mon Sep 17 00:00:00 2001 From: Justin Driscoll Date: Fri, 13 Mar 2009 12:35:33 -0400 Subject: [PATCH 1/2] admin_thumbnail_view no longer crashes when there is no file found --- imagekit/models.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/imagekit/models.py b/imagekit/models.py index cba8fcd..9987ff5 100644 --- a/imagekit/models.py +++ b/imagekit/models.py @@ -78,6 +78,8 @@ class ImageModel(models.Model): return 'An "%s" image spec has not been defined.' % \ self._ik.admin_thumbnail_spec else: + if not prop._exists(): + return None if hasattr(self, 'get_absolute_url'): return u'' % \ (self.get_absolute_url(), prop.url) From cc5c846c0a4cc425e9e668da6e0b09095f227f70 Mon Sep 17 00:00:00 2001 From: Justin Driscoll Date: Fri, 13 Mar 2009 13:14:53 -0400 Subject: [PATCH 2/2] Fixed check in admin_thumbnail_view --- imagekit/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/imagekit/models.py b/imagekit/models.py index 9987ff5..d9e4cd1 100644 --- a/imagekit/models.py +++ b/imagekit/models.py @@ -15,7 +15,7 @@ from imagekit.utils import img_to_fobj ImageFile.MAXBLOCK = getattr(settings, 'PIL_IMAGEFILE_MAXBLOCK', 256 * 2 ** 10) # Choice tuples for specifying the crop origin. -# These are provided for convienience. +# These are provided for convenience. CROP_HORZ_CHOICES = ( (0, _('left')), (1, _('center')), @@ -73,13 +73,13 @@ class ImageModel(models.Model): pass def admin_thumbnail_view(self): + if not getattr(self, self._ik.image_field, None): + return None prop = getattr(self, self._ik.admin_thumbnail_spec, None) if prop is None: return 'An "%s" image spec has not been defined.' % \ self._ik.admin_thumbnail_spec else: - if not prop._exists(): - return None if hasattr(self, 'get_absolute_url'): return u'' % \ (self.get_absolute_url(), prop.url)