diff options
| author | Julien Phalip <jphalip@gmail.com> | 2012-02-05 10:26:05 +0000 |
|---|---|---|
| committer | Julien Phalip <jphalip@gmail.com> | 2012-02-05 10:26:05 +0000 |
| commit | 0f6cf4aba1d3db4be9a0d593becfc10bc4aa1fbe (patch) | |
| tree | 12a7475b55bee8a79893ce3ad6d4a0dddfd03d50 /django | |
| parent | a90aad35116d1a796a301626db5abff5f361da8a (diff) | |
Improved on r17454 to ensure that `collapse.js` only gets minified when `DEBUG` is `False`.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17455 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/helpers.py | 6 | ||||
| -rw-r--r-- | django/contrib/admin/options.py | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py index b7c65e175f..b08d1c84a5 100644 --- a/django/contrib/admin/helpers.py +++ b/django/contrib/admin/helpers.py @@ -11,6 +11,7 @@ from django.utils.encoding import force_unicode, smart_unicode from django.utils.html import escape, conditional_escape from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ +from django.conf import settings ACTION_CHECKBOX_NAME = '_selected_action' @@ -75,7 +76,10 @@ class Fieldset(object): def _media(self): if 'collapse' in self.classes: - js = ['jquery.min.js', 'jquery.init.js', 'collapse.min.js'] + extra = '' if settings.DEBUG else '.min' + js = ['jquery%s.js' % extra, + 'jquery.init.js', + 'collapse%s.js' % extra] return forms.Media(js=[static('admin/js/%s' % url) for url in js]) return forms.Media() media = property(_media) diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index ee4ff976a3..5bfa891a69 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -395,7 +395,7 @@ class ModelAdmin(BaseModelAdmin): @property def media(self): - extra = "" if settings.DEBUG else ".min" + extra = '' if settings.DEBUG else '.min' js = [ 'core.js', 'admin/RelatedObjectLookups.js', @@ -1373,8 +1373,8 @@ class InlineModelAdmin(BaseModelAdmin): @property def media(self): - extra = "" if settings.DEBUG else ".min" - js = ['jquery%s.js' % extra, 'jquery.init.js', "inlines%s.js" % extra] + 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%s.js' % extra]) if self.filter_vertical or self.filter_horizontal: |