From 8a0bd9c5a9de7870b7db6afdb6037a864ab2c92a Mon Sep 17 00:00:00 2001
From: Justin Driscoll <justin.driscoll@gmail.com>
Date: Fri, 9 Jan 2009 09:34:44 -0500
Subject: [PATCH] Fixed IKModel.delete file locking bug

---
 src/imagekit/models.py  | 7 ++++---
 src/imagekit/options.py | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/imagekit/models.py b/src/imagekit/models.py
index 67531fb..e7e5c08 100644
--- a/src/imagekit/models.py
+++ b/src/imagekit/models.py
@@ -49,9 +49,10 @@ class IKModel(models.Model):
         pass
         
     def admin_thumbnail_view(self):
-        prop = getattr(self, 'admin_thumbnail', None)
+        prop = getattr(self, self._ik.admin_thumbnail_spec, None)
         if prop is None:
-            return 'An "admin_thumbnail" image spec has not been defined.'
+            return 'An "%s" image spec has not been defined.' % \
+              self._ik.admin_thumbnail_spec
         else:
             if hasattr(self, 'get_absolute_url'):
                 return u'<a href="%s"><img src="%s"></a>' % \
@@ -106,4 +107,4 @@ class IKModel(models.Model):
     def delete(self):
         assert self._get_pk_val() is not None, "%s object can't be deleted because its %s attribute is set to None." % (self._meta.object_name, self._meta.pk.attname)
         self._clear_cache()
-        super(IKModel, self).delete()
+        models.Model.delete(self)
diff --git a/src/imagekit/options.py b/src/imagekit/options.py
index 3c771fa..1ae5808 100644
--- a/src/imagekit/options.py
+++ b/src/imagekit/options.py
@@ -14,6 +14,7 @@ class Options(object):
     cache_dir = 'images'
     save_count_as = None
     cache_filename_format = "%(filename)s_%(specname)s.%(extension)s"
+    admin_thumbnail_spec = 'admin_thumbnail'
     spec_module = 'imagekit.config'
     
     def __init__(self, opts):