From 6ff500127a21f5f2104dc77a09dfa73d5f7c94ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 18 Oct 2015 11:42:42 +0300 Subject: [PATCH] Fixed #25565 -- Removed action="" from admin forms (invalid in HTML5). --- django/contrib/admin/templates/admin/change_list.html | 2 +- django/contrib/admin/templates/admin/delete_confirmation.html | 2 +- .../admin/templates/admin/delete_selected_confirmation.html | 2 +- django/contrib/admin/templates/admin/search_form.html | 2 +- .../admin/templates/registration/password_change_form.html | 2 +- .../admin/templates/registration/password_reset_confirm.html | 2 +- .../admin/templates/registration/password_reset_form.html | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html index e99b1e0a6e5..0bd44d96b43 100644 --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -81,7 +81,7 @@ {% endif %} {% endblock %} -
{% csrf_token %} + {% csrf_token %} {% if cl.formset %}
{{ cl.formset.management_form }}
{% endif %} diff --git a/django/contrib/admin/templates/admin/delete_confirmation.html b/django/contrib/admin/templates/admin/delete_confirmation.html index cc83be82891..bc26bca3094 100644 --- a/django/contrib/admin/templates/admin/delete_confirmation.html +++ b/django/contrib/admin/templates/admin/delete_confirmation.html @@ -33,7 +33,7 @@ {% include "admin/includes/object_delete_summary.html" %}

{% trans "Objects" %}

- {% csrf_token %} + {% csrf_token %}
{% if is_popup %}{% endif %} diff --git a/django/contrib/admin/templates/admin/delete_selected_confirmation.html b/django/contrib/admin/templates/admin/delete_selected_confirmation.html index 8c8b8aa2f74..5ebd6432e13 100644 --- a/django/contrib/admin/templates/admin/delete_selected_confirmation.html +++ b/django/contrib/admin/templates/admin/delete_selected_confirmation.html @@ -34,7 +34,7 @@ {% for deletable_object in deletable_objects %}
    {{ deletable_object|unordered_list }}
{% endfor %} - {% csrf_token %} + {% csrf_token %}
{% for obj in queryset %} diff --git a/django/contrib/admin/templates/admin/search_form.html b/django/contrib/admin/templates/admin/search_form.html index b3cb2c7a7aa..f241f14cca2 100644 --- a/django/contrib/admin/templates/admin/search_form.html +++ b/django/contrib/admin/templates/admin/search_form.html @@ -1,6 +1,6 @@ {% load i18n admin_static %} {% if cl.search_fields %} -
+
diff --git a/django/contrib/admin/templates/registration/password_change_form.html b/django/contrib/admin/templates/registration/password_change_form.html index a0b8375af77..ddb90e8f82e 100644 --- a/django/contrib/admin/templates/registration/password_change_form.html +++ b/django/contrib/admin/templates/registration/password_change_form.html @@ -14,7 +14,7 @@ {% block content %}
-{% csrf_token %} +{% csrf_token %}
{% if form.errors %}

diff --git a/django/contrib/admin/templates/registration/password_reset_confirm.html b/django/contrib/admin/templates/registration/password_reset_confirm.html index bd24806d46c..a1e0150a5da 100644 --- a/django/contrib/admin/templates/registration/password_reset_confirm.html +++ b/django/contrib/admin/templates/registration/password_reset_confirm.html @@ -16,7 +16,7 @@

{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}

-{% csrf_token %} +{% csrf_token %} {{ form.new_password1.errors }}

{{ form.new_password1 }}

{{ form.new_password2.errors }} diff --git a/django/contrib/admin/templates/registration/password_reset_form.html b/django/contrib/admin/templates/registration/password_reset_form.html index dc05cd02456..23b68a35822 100644 --- a/django/contrib/admin/templates/registration/password_reset_form.html +++ b/django/contrib/admin/templates/registration/password_reset_form.html @@ -14,7 +14,7 @@

{% trans "Forgotten your password? Enter your email address below, and we'll email instructions for setting a new one." %}

-{% csrf_token %} +{% csrf_token %} {{ form.email.errors }}

{{ form.email }}