git.ithinksw.org
/
philo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'entity_raw_id_fields'
[philo.git]
/
admin
/
base.py
diff --git
a/admin/base.py
b/admin/base.py
index
100eb31
..
acba9c3
100644
(file)
--- a/
admin/base.py
+++ b/
admin/base.py
@@
-5,7
+5,7
@@
from django.http import HttpResponse
from django.utils import simplejson as json
from django.utils.html import escape
from philo.models import Tag, Attribute
from django.utils import simplejson as json
from django.utils.html import escape
from philo.models import Tag, Attribute
-from philo.
forms.entiti
es import AttributeForm, AttributeInlineFormSet
+from philo.
admin.forms.attribut
es import AttributeForm, AttributeInlineFormSet
from philo.admin.widgets import TagFilteredSelectMultiple
from mptt.admin import MPTTModelAdmin
from philo.admin.widgets import TagFilteredSelectMultiple
from mptt.admin import MPTTModelAdmin