summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-07-30 17:37:39 +0000
committerJannis Leidel <jannis@leidel.info>2011-07-30 17:37:39 +0000
commit5120f018daa8f2c7e3599b5a2c0d30775bb4ec21 (patch)
tree0fc2c99f1dcaccebb53df6c3021656c9884fa508
parent343b4f1ea5ffc48c03138640a85a1781ccbf2964 (diff)
Fixed #16540 -- Fixed typo in InlineModelAdmin introduced in r16487 that broke the prepopulated fields. Thanks, mk.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-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 550f46aed3..ec5dac5b67 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -1329,7 +1329,7 @@ class InlineModelAdmin(BaseModelAdmin):
def _media(self):
js = ['jquery.min.js', 'jquery.init.js', 'inlines.min.js']
if self.prepopulated_fields:
- js.extend(['urlify.js, prepopulate.min.js'])
+ js.extend(['urlify.js', 'prepopulate.min.js'])
if self.filter_vertical or self.filter_horizontal:
js.extend(['SelectBox.js', 'SelectFilter2.js'])
return forms.Media(js=['admin/js/%s' % url for url in js])