Commit cf546e11 authored by Johannes Hoppe's avatar Johannes Hoppe Committed by Tim Graham
Browse files

Fixed #21221 -- Made form Media and static template tag use staticfiles if installed.

parent 6be9589e

django/contrib/admin/helpers.py

+1 −2
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ import warnings 


from django import forms

from django.conf import settings

from django.contrib.admin.templatetags.admin_static import static

from django.contrib.admin.utils import (

    display_for_field, flatten_fieldsets, help_text_for_field, label_for_field,

    lookup_field,
@@ -77,7 +76,7 @@ class Fieldset(object): 
            js = ['vendor/jquery/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(js=['admin/js/%s' % url for url in js])

        return forms.Media()

    media = property(_media)

django/contrib/admin/options.py

+2 −3
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ from django.contrib.admin.checks import ( 
    BaseModelAdminChecks, InlineModelAdminChecks, ModelAdminChecks,

)

from django.contrib.admin.exceptions import DisallowedModelAdminToField

from django.contrib.admin.templatetags.admin_static import static

from django.contrib.admin.templatetags.admin_urls import add_preserved_filters

from django.contrib.admin.utils import (

    NestedObjects, flatten_fieldsets, get_deleted_objects,
@@ -577,7 +576,7 @@ class ModelAdmin(BaseModelAdmin): 
            'prepopulate%s.js' % extra,

            'vendor/xregexp/xregexp.min.js',

        ]

        return forms.Media(js=[static('admin/js/%s' % url) for url in js])

        return forms.Media(js=['admin/js/%s' % url for url in js])



    def get_model_perms(self, request):

        """
@@ -1820,7 +1819,7 @@ class InlineModelAdmin(BaseModelAdmin): 
              'inlines%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])

        return forms.Media(js=['admin/js/%s' % url for url in js])



    def get_extra(self, request, obj=None, **kwargs):

        """Hook for customizing the number of extra inline forms."""

django/contrib/admin/templates/admin/auth/user/change_password.html

+1 −1
Original line number Diff line number Diff line 
{% extends "admin/base_site.html" %}

{% load i18n admin_static %}

{% load i18n static %}

{% load admin_urls %}



{% block extrahead %}{{ block.super }}

django/contrib/admin/templates/admin/base.html

+1 −1
Original line number Diff line number Diff line 
{% load i18n admin_static %}<!DOCTYPE html>

{% load i18n static %}<!DOCTYPE html>

{% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}

<html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>

<head>

django/contrib/admin/templates/admin/change_form.html

+1 −1
Original line number Diff line number Diff line 
{% extends "admin/base_site.html" %}

{% load i18n admin_urls admin_static admin_modify %}

{% load i18n admin_urls static admin_modify %}



{% block extrahead %}{{ block.super }}

<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>