From 4febfc3be67c34dd6a9407effc83a4ea4e335da5 Mon Sep 17 00:00:00 2001 From: Marian Sigler Date: Fri, 21 Sep 2012 04:10:44 +0200 Subject: basic settings (yet without confirmation mail on mail change etc) --- forms.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'forms.py') diff --git a/forms.py b/forms.py index 45d2074..0feb375 100644 --- a/forms.py +++ b/forms.py @@ -1,15 +1,15 @@ # -*- coding: utf-8 -*- from flask.ext.wtf import Form, validators, TextField, PasswordField +from utils import _username_re -username = TextField('Benutzername', [validators.Length(min=4, max=20)]) -mail = TextField('E-Mail-Adresse', [validators.Email(), validators.Length(min=6, max=50)]) +username = TextField('Benutzername', [validators.Regexp(_username_re, message=u'Benutzername darf nur aus a-z bestehen (2-16 Zeichen)')]) class RegisterForm(Form): username = username password = PasswordField('Passwort', [validators.Required(), validators.EqualTo('password_confirm', message=u'Passwörter stimmen nicht überein')]) password_confirm = PasswordField(u'Passwort bestätigen') - mail = mail + mail = TextField('E-Mail-Adresse', [validators.Email(), validators.Length(min=6, max=50)]) class LoginForm(Form): @@ -18,8 +18,8 @@ class LoginForm(Form): class SettingsForm(Form): - old_password = PasswordField('Passwort', [validators.Required()]) - password = PasswordField('Neues Passwort', [validators.Required(), + old_password = PasswordField('Passwort', [validators.Required(u'Bitte gib dein (altes) Passwort an, um deine Daten zu ändern.')]) + password = PasswordField('Neues Passwort', [validators.Optional(), validators.EqualTo('password_confirm', message=u'Passwörter stimmen nicht überein')]) password_confirm = PasswordField(u'Passwort bestätigen') - mail = mail + mail = TextField('E-Mail-Adresse', [validators.Optional(), validators.Email(), validators.Length(min=6, max=50)]) -- cgit v1.2.3-1-g7c22