Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #22329 -- Used label_tag() in some admin auth templates.

refs #17922.
  • Loading branch information...
commit ed4c2e1c0d9e43c09767b02fd8b4bd74a5dfe512 1 parent 2cc8840
@timgraham timgraham authored
View
7 django/contrib/admin/forms.py
@@ -2,7 +2,7 @@
from django import forms
-from django.contrib.auth.forms import AuthenticationForm
+from django.contrib.auth.forms import AuthenticationForm, PasswordChangeForm
from django.utils.translation import ugettext_lazy as _
@@ -15,6 +15,7 @@ class AdminAuthenticationForm(AuthenticationForm):
"for a staff account. Note that both fields may be "
"case-sensitive."),
}
+ required_css_class = 'required'
def confirm_login_allowed(self, user):
if not user.is_active or not user.is_staff:
@@ -23,3 +24,7 @@ def confirm_login_allowed(self, user):
code='invalid_login',
params={'username': self.username_field.verbose_name}
)
+
+
+class AdminPasswordChangeForm(PasswordChangeForm):
+ required_css_class = 'required'
View
2  django/contrib/admin/sites.py
@@ -273,10 +273,12 @@ def password_change(self, request):
"""
Handles the "change password" task -- both form display and validation.
"""
+ from django.contrib.admin.forms import AdminPasswordChangeForm
from django.contrib.auth.views import password_change
url = reverse('admin:password_change_done', current_app=self.name)
defaults = {
'current_app': self.name,
+ 'password_change_form': AdminPasswordChangeForm,
'post_change_redirect': url,
'extra_context': self.each_context(),
}
View
6 django/contrib/admin/templates/admin/auth/user/change_password.html
@@ -34,14 +34,12 @@
<div class="form-row">
{{ form.password1.errors }}
- {# TODO: get required class on label_tag #}
- <label for="id_password1" class="required">{% trans 'Password' %}:</label> {{ form.password1 }}
+ {{ form.password1.label_tag }} {{ form.password1 }}
</div>
<div class="form-row">
{{ form.password2.errors }}
- {# TODO: get required class on label_tag #}
- <label for="id_password2" class="required">{% trans 'Password (again)' %}:</label> {{ form.password2 }}
+ {{ form.password2.label_tag }} {{ form.password2 }}
<p class="help">{% trans 'Enter the same password as above, for verification.' %}</p>
</div>
View
4 django/contrib/admin/templates/admin/login.html
@@ -30,11 +30,11 @@
<form action="{{ app_path }}" method="post" id="login-form">{% csrf_token %}
<div class="form-row">
{{ form.username.errors }}
- <label for="id_username" class="required">{{ form.username.label }}:</label> {{ form.username }}
+ {{ form.username.label_tag }} {{ form.username }}
</div>
<div class="form-row">
{{ form.password.errors }}
- <label for="id_password" class="required">{% trans 'Password:' %}</label> {{ form.password }}
+ {{ form.password.label_tag }} {{ form.password }}
<input type="hidden" name="next" value="{{ next }}" />
</div>
{% url 'admin_password_reset' as password_reset_url %}
View
6 django/contrib/admin/templates/registration/password_change_form.html
@@ -29,17 +29,17 @@
<div class="form-row">
{{ form.old_password.errors }}
- <label for="id_old_password" class="required">{% trans 'Old password' %}:</label>{{ form.old_password }}
+ {{ form.old_password.label_tag }} {{ form.old_password }}
</div>
<div class="form-row">
{{ form.new_password1.errors }}
- <label for="id_new_password1" class="required">{% trans 'New password' %}:</label>{{ form.new_password1 }}
+ {{ form.new_password1.label_tag }} {{ form.new_password1 }}
</div>
<div class="form-row">
{{ form.new_password2.errors }}
- <label for="id_new_password2" class="required">{% trans 'Password (again)' %}:</label>{{ form.new_password2 }}
+ {{ form.new_password2.label_tag }} {{ form.new_password2 }}
</div>
</fieldset>
View
1  django/contrib/auth/forms.py
@@ -348,6 +348,7 @@ class AdminPasswordChangeForm(forms.Form):
error_messages = {
'password_mismatch': _("The two password fields didn't match."),
}
+ required_css_class = 'required'
password1 = forms.CharField(label=_("Password"),
widget=forms.PasswordInput)
password2 = forms.CharField(label=_("Password (again)"),
Please sign in to comment.
Something went wrong with that request. Please try again.