Commit 1d32bdd3 authored by Jannis Leidel's avatar Jannis Leidel
Browse files

Fixed #15252 -- Added static template tag and CachedStaticFilesStorage to staticfiles contrib app. 

Many thanks to Florian Apolloner and Jacob Kaplan-Moss for reviewing and eagle eyeing.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent e9a909e3

django/contrib/admin/helpers.py

+2 −1
Original line number Diff line number Diff line 
from django import forms

from django.contrib.admin.util import (flatten_fieldsets, lookup_field,

    display_for_field, label_for_field, help_text_for_field)

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

from django.contrib.contenttypes.models import ContentType

from django.core.exceptions import ObjectDoesNotExist

from django.db.models.fields.related import ManyToManyRel
@@ -75,7 +76,7 @@ class Fieldset(object): 
    def _media(self):

        if 'collapse' in self.classes:

            js = ['jquery.min.js', 'jquery.init.js', 'collapse.min.js']

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

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

        return forms.Media()

    media = property(_media)

django/contrib/admin/options.py

+7 −6
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ from django.forms.models import (modelform_factory, modelformset_factory, 
from django.contrib.contenttypes.models import ContentType

from django.contrib.admin import widgets, helpers

from django.contrib.admin.util import unquote, flatten_fieldsets, get_deleted_objects, model_format_dict

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

from django.contrib import messages

from django.views.decorators.csrf import csrf_protect

from django.core.exceptions import PermissionDenied, ValidationError
@@ -350,7 +351,8 @@ class ModelAdmin(BaseModelAdmin): 
        return self.get_urls()

    urls = property(urls)



    def _media(self):

    @property

    def media(self):

        js = [

            'core.js',

            'admin/RelatedObjectLookups.js',
@@ -363,8 +365,7 @@ class ModelAdmin(BaseModelAdmin): 
            js.extend(['urlify.js', 'prepopulate.min.js'])

        if self.opts.get_ordered_objects():

            js.extend(['getElementsBySelector.js', 'dom-drag.js' , 'admin/ordering.js'])

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

    media = property(_media)

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



    def has_add_permission(self, request):

        """
@@ -1322,14 +1323,14 @@ class InlineModelAdmin(BaseModelAdmin): 
        if self.verbose_name_plural is None:

            self.verbose_name_plural = self.model._meta.verbose_name_plural



    def _media(self):

    @property

    def media(self):

        js = ['jquery.min.js', 'jquery.init.js', 'inlines.min.js']

        if self.prepopulated_fields:

            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])

    media = property(_media)

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



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

        """Returns a BaseInlineFormSet class for use in admin add/change views."""

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 static admin_modify %}

{% load i18n admin_static admin_modify %}

{% load url from future %}

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

{% url 'admin:jsi18n' as jsi18nurl %}

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

+1 −1
Original line number Diff line number Diff line 
{% load static %}{% load url from future %}<!DOCTYPE html>

{% load admin_static %}{% load url from future %}<!DOCTYPE html>

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

<head>

<title>{% block title %}{% endblock %}</title>

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 static admin_modify %}

{% load i18n admin_static admin_modify %}

{% load url from future %}



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