diff options
| author | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2014-05-12 21:49:54 +0200 |
|---|---|---|
| committer | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2014-05-12 21:49:54 +0200 |
| commit | 3ab21967201d5ed092bf1c2d3dea084aa30cabcb (patch) | |
| tree | 1ea1661f8d2574880b1d7b674e228a6d95a5c8d8 /pyaggr3g470r/forms.py | |
| parent | Updated meta description tag in layout.html. (diff) | |
| download | newspipe-3ab21967201d5ed092bf1c2d3dea084aa30cabcb.tar.gz newspipe-3ab21967201d5ed092bf1c2d3dea084aa30cabcb.tar.bz2 newspipe-3ab21967201d5ed092bf1c2d3dea084aa30cabcb.zip | |
Simplification of the login forms.
Diffstat (limited to 'pyaggr3g470r/forms.py')
| -rw-r--r-- | pyaggr3g470r/forms.py | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/pyaggr3g470r/forms.py b/pyaggr3g470r/forms.py index d89c3062..fe2dd0d8 100644 --- a/pyaggr3g470r/forms.py +++ b/pyaggr3g470r/forms.py @@ -36,8 +36,7 @@ from flask_wtf import RecaptchaField from pyaggr3g470r.models import User class SignupForm(Form): - firstname = TextField(lazy_gettext("First name"), [validators.Required(lazy_gettext("Please enter your first name."))]) - lastname = TextField(lazy_gettext("Last name"), [validators.Required(lazy_gettext("Please enter your last name."))]) + nickname = TextField(lazy_gettext("Nickname"), [validators.Required(lazy_gettext("Please enter your nickname."))]) email = EmailField(lazy_gettext("Email"), [validators.Length(min=6, max=35), validators.Required(lazy_gettext("Please enter your email."))]) password = PasswordField(lazy_gettext("Password"), [validators.Required(lazy_gettext("Please enter a password.")), validators.Length(min=6, max=100)]) recaptcha = RecaptchaField() @@ -49,11 +48,8 @@ class SignupForm(Form): def validate(self): if not Form.validate(self): return False - if self.firstname.data != User.make_valid_nickname(self.firstname.data): - self.firstname.errors.append(lazy_gettext('This firstname has invalid characters. Please use letters, numbers, dots and underscores only.')) - return False - if self.lastname.data != User.make_valid_nickname(self.lastname.data): - self.lastname.errors.append(lazy_gettext('This lastname has invalid characters. Please use letters, numbers, dots and underscores only.')) + if self.nickname.data != User.make_valid_nickname(self.nickname.data): + self.nickname.errors.append(lazy_gettext('This nickname has invalid characters. Please use letters, numbers, dots and underscores only.')) return False return True @@ -97,8 +93,7 @@ class AddFeedForm(Form): return True class ProfileForm(Form): - firstname = TextField(lazy_gettext("First name"), [validators.Required(lazy_gettext("Please enter your first name."))]) - lastname = TextField(lazy_gettext("Last name"), [validators.Required(lazy_gettext("Please enter your last name."))]) + nickname = TextField(lazy_gettext("Nickname"), [validators.Required(lazy_gettext("Please enter your nickname."))]) email = EmailField(lazy_gettext("Email"), [validators.Length(min=6, max=35), validators.Required(lazy_gettext("Please enter your email."))]) password = PasswordField(lazy_gettext("Password")) submit = SubmitField(lazy_gettext("Save")) @@ -109,10 +104,7 @@ class ProfileForm(Form): def validate(self): if not Form.validate(self): return False - if self.firstname.data != User.make_valid_nickname(self.firstname.data): - self.firstname.errors.append(lazy_gettext('This firstname has invalid characters. Please use letters, numbers, dots and underscores only.')) - return False - if self.lastname.data != User.make_valid_nickname(self.lastname.data): - self.lastname.errors.append(lazy_gettext('This lastname has invalid characters. Please use letters, numbers, dots and underscores only.')) + if self.nickname.data != User.make_valid_nickname(self.nickname.data): + self.nickname.errors.append(lazy_gettext('This nickname has invalid characters. Please use letters, numbers, dots and underscores only.')) return False return True |