summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-03-21 01:54:00 +0000
committerJannis Leidel <jannis@leidel.info>2010-03-21 01:54:00 +0000
commit3f4fef432b10fdf69271ccb57181a43484916c7b (patch)
treec53a40cb97e518a83107dab18973f47087cd9220 /django
parent2403f581b3cd0e7528f4b60c712f460fed91e2c2 (diff)
Fixed #12778 - Added media handling abilities to admin inlines. Thanks for the patch, pmclanahan.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/options.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 4504e9dbb3..be91ffa41e 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -58,6 +58,7 @@ csrf_protect_m = method_decorator(csrf_protect)
class BaseModelAdmin(object):
"""Functionality common to both ModelAdmin and InlineAdmin."""
+ __metaclass__ = forms.MediaDefiningClass
raw_id_fields = ()
fields = None
@@ -186,7 +187,6 @@ class BaseModelAdmin(object):
class ModelAdmin(BaseModelAdmin):
"Encapsulates all admin options and functionality for a given model."
- __metaclass__ = forms.MediaDefiningClass
list_display = ('__str__',)
list_display_links = ()