From ba8c4e9c44cbd062082aed034a97778806fe9194 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Fri, 30 Aug 2019 15:46:05 +0200
Subject: [PATCH] Visually indicating which field are required
---
basetheme_bootstrap/forms.py | 17 +++++++++--------
setup.py | 2 +-
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/basetheme_bootstrap/forms.py b/basetheme_bootstrap/forms.py
index 6fbecd1..19e1964 100644
--- a/basetheme_bootstrap/forms.py
+++ b/basetheme_bootstrap/forms.py
@@ -13,6 +13,7 @@ def is_username_is_email():
except AttributeError:
return False
+
def is_first_last_name_required():
try:
return settings.BASETHEME_BOOTSTRAP_FIRST_LAST_NAME_REQUIRED
@@ -36,9 +37,9 @@ class CleanUsernameAndSuggestReset:
'The email already exists, if you have lost your password you can reset it '
'<a href="%s">here</a>.') % (reverse('basetheme_bootstrap:password_reset'))))
if is_first_last_name_required():
- if len(f.get("first_name", ""))==0:
+ if len(f.get("first_name", "")) == 0:
self.add_error("email", _("First name is required"))
- if len(f.get("last_name", ""))==0:
+ if len(f.get("last_name", "")) == 0:
self.add_error("email", _("Last name is required"))
return f
@@ -51,12 +52,12 @@ class UserCreationFormWithMore(CleanUsernameAndSuggestReset, auth_forms.UserCrea
def __init__(self, *args, **kwargs):
super(UserCreationFormWithMore, self).__init__(*args, **kwargs)
- self.fields['email'].widget.attrs.update({'required': True})
+ self.fields['email'].required = True
if is_username_is_email():
del self.fields['username']
if is_first_last_name_required():
- self.fields['first_name'].widget.attrs.update({'required': True})
- self.fields['last_name'].widget.attrs.update({'required': True})
+ self.fields['first_name'].required = True
+ self.fields['last_name'].required = True
def save(self, commit=True):
user = super().save(commit=False)
@@ -76,10 +77,10 @@ class MyUserChangeForm(CleanUsernameAndSuggestReset, auth_forms.UserChangeForm):
super().__init__(*args, **kwargs)
if is_username_is_email():
del self.fields['username']
- self.fields['email'].widget.attrs.update({'required': True})
+ self.fields['email'].required = True
if is_first_last_name_required():
- self.fields['first_name'].widget.attrs.update({'required': True})
- self.fields['last_name'].widget.attrs.update({'required': True})
+ self.fields['first_name'].required = True
+ self.fields['last_name'].required = True
def save(self, commit=True):
user = super().save(commit=False)
diff --git a/setup.py b/setup.py
index fdc220c..90201ba 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ readme = open('README.rst').read()
setup(
name='django-basetheme-bootstrap',
- version='0.2.9',
+ version='0.2.10',
description='Django Basetheme Bootstrap',
long_description=readme,
author='Bryan Brancotte',
--
GitLab