Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

This was missing from f49e9a5.
  • Loading branch information...
commit bc787f6a3222c2d425d96dea57a1516b31677bf5 1 parent 99edbe0
@aaugustin aaugustin authored
View
4 django/contrib/admin/templates/admin/base.html
@@ -1,4 +1,4 @@
-{% 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 %}
View
2  django/contrib/admin/templates/admin/change_list_results.html
@@ -1,4 +1,4 @@
-{% 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 %}
View
2  django/contrib/admin/templates/admin/edit_inline/tabular.html
@@ -1,4 +1,4 @@
-{% 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 }}
View
2  django/contrib/admindocs/templates/admin_doc/template_filter_index.html
@@ -1,5 +1,5 @@
{% extends "admin/base_site.html" %}
-{% load i18n %}
+{% load i18n %}{% load firstof from future %}
{% block coltype %}colSM{% endblock %}
{% block breadcrumbs %}
View
2  django/contrib/admindocs/templates/admin_doc/template_tag_index.html
@@ -1,5 +1,5 @@
{% extends "admin/base_site.html" %}
-{% load i18n %}
+{% load i18n %}{% load firstof from future %}
{% block coltype %}colSM{% endblock %}
{% block breadcrumbs %}
View
2  django/views/debug.py
@@ -926,7 +926,7 @@ def default_urlconf(request):
</html>
"""
-TECHNICAL_500_TEXT_TEMPLATE = """{% firstof exception_type 'Report' %}{% if request %} at {{ request.path_info }}{% endif %}
+TECHNICAL_500_TEXT_TEMPLATE = """{% load firstof from future %}{% firstof exception_type 'Report' %}{% if request %} at {{ request.path_info }}{% endif %}
{% firstof exception_value 'No exception supplied' %}
{% if request %}
Request Method: {{ request.META.REQUEST_METHOD }}
Please sign in to comment.
Something went wrong with that request. Please try again.