Commit bc787f6a authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Loaded cycle and firstof from future in built-in templates. Refs #17906. 

This was missing from f49e9a51.
parent 99edbe0e

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

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

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

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

<head>

<title>{% block title %}{% endblock %}</title>
@@ -26,7 +26,7 @@ 
        {% if user.is_active and user.is_staff %}

        <div id="user-tools">

            {% trans 'Welcome,' %}

            <strong>{% filter force_escape %}{% firstof user.get_short_name user.get_username %}{% endfilter %}</strong>.

            <strong>{% firstof user.get_short_name user.get_username %}</strong>.

            {% block userlinks %}

                {% url 'django-admindocs-docroot' as docsroot %}

                {% if docsroot %}

django/contrib/admin/templates/admin/change_list_results.html

+1 −1
Original line number Diff line number Diff line 
{% load i18n admin_static %}

{% load i18n admin_static %}{% load cycle from future %}

{% if result_hidden_fields %}

<div class="hiddenfields">{# DIV for HTML validation #}

{% for item in result_hidden_fields %}{{ item }}{% endfor %}

django/contrib/admin/templates/admin/edit_inline/tabular.html

+1 −1
Original line number Diff line number Diff line 
{% load i18n admin_static admin_modify %}

{% load i18n admin_static admin_modify %}{% load cycle from future %}

<div class="inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">

  <div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">

{{ inline_admin_formset.formset.management_form }}

django/contrib/admindocs/templates/admin_doc/template_filter_index.html

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

{% load i18n %}

{% load i18n %}{% load firstof from future %}



{% block coltype %}colSM{% endblock %}

{% block breadcrumbs %}

django/contrib/admindocs/templates/admin_doc/template_tag_index.html

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

{% load i18n %}

{% load i18n %}{% load firstof from future %}



{% block coltype %}colSM{% endblock %}

{% block breadcrumbs %}