summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Rosner <brosner@gmail.com>2008-08-15 20:33:45 +0000
committerBrian Rosner <brosner@gmail.com>2008-08-15 20:33:45 +0000
commit0ca738363afafacf1a82c978b2a2d1e00d9495a8 (patch)
treeb8eb8d8a388c830c37696169b8d15eb0cdf6c3ed
parent727133109cfb37d73da38d760198eb300125ddb0 (diff)
Fixed #8292 -- Honor filter_horizontal and filter_vertical in inlines correctly. It now adds the right Javascript to handle them when they are the only ones on the page. Thanks dakrauth for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8392 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/admin/options.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 5984dd82f3..fc7541e37f 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -828,6 +828,8 @@ class InlineModelAdmin(BaseModelAdmin):
js = []
if self.prepopulated_fields:
js.append('js/urlify.js')
+ if self.filter_vertical or self.filter_horizontal:
+ js.extend(['js/SelectBox.js' , 'js/SelectFilter2.js'])
return forms.Media(js=['%s%s' % (settings.ADMIN_MEDIA_PREFIX, url) for url in js])
media = property(_media)