From 94cbb64a44918f89d1fc4e95ef12fd89b2f196c7 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Fri, 20 Jul 2018 00:13:54 +0200 Subject: [PATCH 2/4] use new password widget in login form (#25045) This commit also modify AuthenticationForm to remove explicit loading of authentic2/js/js_seconds_until.html from login_password.html. --- src/authentic2/forms/__init__.py | 9 +++++++++ .../templates/authentic2/login_password_form.html | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/authentic2/forms/__init__.py b/src/authentic2/forms/__init__.py index 507d9624..97f4c4ab 100644 --- a/src/authentic2/forms/__init__.py +++ b/src/authentic2/forms/__init__.py @@ -7,6 +7,7 @@ from django.contrib.auth import REDIRECT_FIELD_NAME, forms as auth_forms from django.utils import html from authentic2.compat import get_user_model +from authentic2.forms.fields import PasswordField from .. import app_settings from ..exponential_retry_timeout import ExponentialRetryTimeout @@ -157,6 +158,8 @@ def modelform_factory(model, **kwargs): class AuthenticationForm(auth_forms.AuthenticationForm): + password = PasswordField(label=_('Password')) + def __init__(self, *args, **kwargs): super(AuthenticationForm, self).__init__(*args, **kwargs) self.exponential_backoff = ExponentialRetryTimeout( @@ -200,6 +203,12 @@ class AuthenticationForm(auth_forms.AuthenticationForm): self.exponential_backoff.success(*keys) return self.cleaned_data + @property + def media(self): + media = super(AuthenticationForm, self).media + media.add_js(['authentic2/js/js_seconds_until.js']) + return media + class SiteImportForm(forms.Form): site_json = forms.FileField(label=_('Site Export File')) diff --git a/src/authentic2/templates/authentic2/login_password_form.html b/src/authentic2/templates/authentic2/login_password_form.html index f3e9b0d2..dfdcc106 100644 --- a/src/authentic2/templates/authentic2/login_password_form.html +++ b/src/authentic2/templates/authentic2/login_password_form.html @@ -19,4 +19,4 @@ {% endif %} - +{{ form.media }} -- 2.18.0