From a0a6e244445a374ef30a7fec4b4795f157bc3b32 Mon Sep 17 00:00:00 2001 From: yomguy Date: Tue, 29 Mar 2011 11:55:25 +0200 Subject: [PATCH] bugfix --- telemeta/models/system.py | 8 +++----- telemeta/templatetags/telemeta_utils.py | 1 - 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/telemeta/models/system.py b/telemeta/models/system.py index 3cf8c40b..0b2d8633 100644 --- 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 9b98df5d..df83d36a 100644 --- 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 -- 2.39.5