diff options
| author | Julien Phalip <jphalip@gmail.com> | 2012-02-05 08:35:08 +0000 |
|---|---|---|
| committer | Julien Phalip <jphalip@gmail.com> | 2012-02-05 08:35:08 +0000 |
| commit | a90aad35116d1a796a301626db5abff5f361da8a (patch) | |
| tree | e84d3bcb28f01d7f52a16d53be0b95da8f502709 /django | |
| parent | 3732c82f5946ec192324a353085cf1988adc0269 (diff) | |
Fixed #17521 -- Made the minified JS files be used in the admin only when `DEBUG` is `False`. Thanks to Travis Swicegood for the suggestion and patch, and to viciu for the tests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17454 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/options.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 3a0ad7475d..ee4ff976a3 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -1,5 +1,6 @@ from functools import update_wrapper, partial from django import forms +from django.conf import settings from django.forms.formsets import all_valid from django.forms.models import (modelform_factory, modelformset_factory, inlineformset_factory, BaseInlineFormSet) @@ -394,16 +395,17 @@ class ModelAdmin(BaseModelAdmin): @property def media(self): + extra = "" if settings.DEBUG else ".min" js = [ 'core.js', 'admin/RelatedObjectLookups.js', - 'jquery.min.js', + 'jquery%s.js' % extra, 'jquery.init.js' ] if self.actions is not None: - js.append('actions.min.js') + js.append('actions%s.js' % extra) if self.prepopulated_fields: - js.extend(['urlify.js', 'prepopulate.min.js']) + js.extend(['urlify.js', 'prepopulate%s.js' % extra]) if self.opts.get_ordered_objects(): js.extend(['getElementsBySelector.js', 'dom-drag.js' , 'admin/ordering.js']) return forms.Media(js=[static('admin/js/%s' % url) for url in js]) @@ -1371,9 +1373,10 @@ class InlineModelAdmin(BaseModelAdmin): @property def media(self): - js = ['jquery.min.js', 'jquery.init.js', 'inlines.min.js'] + extra = "" if settings.DEBUG else ".min" + js = ['jquery%s.js' % extra, 'jquery.init.js', "inlines%s.js" % extra] if self.prepopulated_fields: - js.extend(['urlify.js', 'prepopulate.min.js']) + js.extend(['urlify.js', 'prepopulate%s.js' % extra]) if self.filter_vertical or self.filter_horizontal: js.extend(['SelectBox.js', 'SelectFilter2.js']) return forms.Media(js=[static('admin/js/%s' % url) for url in js]) |