bugfix

diff --git a/telemeta/models/system.py b/telemeta/models/system.py
index 3cf8c40bee1e6be889bc33ad5690eb44d56b8a41..0b2d863331cc85e3c0e4fe4334a4ab68c8bd2713 100644 (file)
--- a/telemeta/models/system.py
+++ b/telemeta/models/system.py
@@ -35,7 +35,7 @@
 
 from django.contrib.auth.models import User
 from telemeta.models.core import *
-from django.db import models
+import django.db.models
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils.translation import ugettext_lazy as _
 
@@ -71,15 +71,13 @@ class Revision(ModelCore):
         db_table = 'revisions'
 
 
-class UserProfile(models.Model):
+class UserProfile(django.db.models.Model):
     "User profile extension"
     
-    user            = models.ForeignKey(User, unique=True)
+    user            = django.db.models.ForeignKey(User, unique=True)
     institution     = CharField(_('institution'))
     function        = CharField(_('function'))
     address         = TextField(_('address'))
     telephone       = CharField(_('function'))
     expiration_date = DateField(_('expiration_date'))
     
-
-    

diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py
index 9b98df5dc2415f10d6499990ca42ad147f6d77f3..df83d36a3d2378b5efd00c2f7d5d52d2f22ec4ad 100644 (file)
--- a/telemeta/templatetags/telemeta_utils.py
+++ b/telemeta/templatetags/telemeta_utils.py
@@ -6,7 +6,6 @@ import telemeta.models.dublincore as dc
 from django.utils import html
 from django import template
 from django.utils.text import capfirst
-from telemeta import models
 from django.utils.translation import ungettext
 from docutils.core import publish_parts
 from django.utils.encoding import smart_str, force_unicode