places ENML to XML mimetype conversion in the wrong place, this should work for celery.

[oweals/karmaworld.git] / karmaworld / apps / notes / models.py

diff --git a/karmaworld/apps/notes/models.py b/karmaworld/apps/notes/models.py
index 56446494978e7de54a23c39be7be87092fd007df..cc7a262991ca8e20089dcd55de85e3d3611760a1 100644 (file)
--- a/karmaworld/apps/notes/models.py
+++ b/karmaworld/apps/notes/models.py
@@ -23,7 +23,7 @@ from taggit.managers import TaggableManager
 from karmaworld.apps.courses.models import Course
 
 try:
-    from secret.drive import GOOGLE_USER
+    from secrets.drive import GOOGLE_USER
 except:
     GOOGLE_USER = u'admin@karmanotes.org'
 
@@ -76,7 +76,7 @@ class Document(models.Model):
         """ generate a unique slug based on name and uploaded_at  """
         _slug = defaultfilters.slugify(self.name)
         klass = self.__class__
-        collision = klass.objects.filter(slug=self.slug)
+        collision = klass.objects.filter(slug=_slug)
         if collision:
             _slug = u"{0}-{1}-{2}-{3}".format(
                     _slug, self.uploaded_at.month,