Revert (I hate hg!!!)

1 files changed, 3 insertions, 3 deletions

diff --git a/core/models.py b/core/models.py
index 6924606..8cc91ea 100644
--- a/core/models.py
+++ b/core/models.py
@@ -10,7 +10,7 @@ from django.db.models import Min, Max
 from django.conf import settings
 from decimal import Decimal, getcontext
 from django.core.urlresolvers import reverse
-from imagekit.models import ProcessedImageField #ImageModel
+from imagekit.models import ImageModel
 from django.template import Context, loader
 import settings
 getcontext().prec=2 #use 2 significant figures for decimal calculations
@@ -57,7 +57,7 @@ class TroggleModel(models.Model):
     class Meta:
         abstract = True
 
-class TroggleImageModel(models.Model):
+class TroggleImageModel(ImageModel):
     new_since_parsing = models.BooleanField(default=False, editable=False)
     
     def object_name(self):
@@ -807,7 +807,7 @@ def get_scan_path(instance, filename):
         number=str(instance.survey.wallet_letter) + number #two strings formatting because convention is 2009#01 or 2009#X01
     return os.path.join('./',year,year+r'#'+number,str(instance.contents)+str(instance.number_in_wallet)+r'.jpg')
 
-class ScannedImage(TroggleImageModel):
+class ScannedImage(TroggleImageModel): 
     file = models.ImageField(storage=scansFileStorage, upload_to=get_scan_path)
     scanned_by = models.ForeignKey(Person,blank=True, null=True)
     scanned_on = models.DateField(null=True)