From: Joseph Spiros Date: Mon, 28 Jun 2010 20:03:50 +0000 (-0400) Subject: Fixing imports on admin.widgets, forgot to move some from admin.base. X-Git-Tag: philo-0.9~68 X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/07c6ede89de3e274dbec6e6055b8d039efe20184 Fixing imports on admin.widgets, forgot to move some from admin.base. --- diff --git a/admin/base.py b/admin/base.py index b6f47a0..0383ad4 100644 --- a/admin/base.py +++ b/admin/base.py @@ -1,16 +1,6 @@ from django.contrib import admin -#from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes import generic -#from django import forms -#from django.conf import settings -#from django.utils.translation import ugettext as _ -#from django.utils.safestring import mark_safe -#from django.utils.html import escape -#from django.utils.text import truncate_words -from philo.models import * -#from philo.admin import widgets -#from django.core.exceptions import ValidationError, ObjectDoesNotExist -#from validators import TreeParentValidator, TreePositionValidator +from philo.models import Attribute, Relationship COLLAPSE_CLASSES = ('collapse', 'collapse-closed', 'closed',) diff --git a/admin/widgets.py b/admin/widgets.py index a1f5bae..f8799fe 100644 --- a/admin/widgets.py +++ b/admin/widgets.py @@ -1,5 +1,9 @@ from django import forms from django.conf import settings +from django.utils.translation import ugettext as _ +from django.utils.safestring import mark_safe +from django.utils.text import truncate_words +from django.utils.html import escape class ModelLookupWidget(forms.TextInput):