diff options
| author | Aditi <aditi.iitr@gmail.com> | 2013-08-28 23:28:09 +0530 |
|---|---|---|
| committer | Aditi <aditi.iitr@gmail.com> | 2013-08-28 23:28:09 +0530 |
| commit | 922599990d07d4ab1eb34cd57d59a4ced6882884 (patch) | |
| tree | 743e8a7572129dd4b905b535bf2a306886125304 /mediagoblin/edit/forms.py | |
| parent | 7d9dbe32ccf1606d8ffa147bad2ac81e2af66ec6 (diff) | |
| parent | 7904402750df610102bc487dab4b4a3e01e15b91 (diff) | |
| download | mediagoblin-922599990d07d4ab1eb34cd57d59a4ced6882884.tar.lz mediagoblin-922599990d07d4ab1eb34cd57d59a4ced6882884.tar.xz mediagoblin-922599990d07d4ab1eb34cd57d59a4ced6882884.zip | |
Pull changes and resolve merge conflict.
Diffstat (limited to 'mediagoblin/edit/forms.py')
| -rw-r--r-- | mediagoblin/edit/forms.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py index 5de1bf96..3f1e2386 100644 --- a/mediagoblin/edit/forms.py +++ b/mediagoblin/edit/forms.py @@ -61,10 +61,6 @@ class EditProfileForm(wtforms.Form): class EditAccountForm(wtforms.Form): - new_email = wtforms.TextField( - _('New email address'), - [wtforms.validators.Optional(), - normalize_user_or_email_field(allow_user=False)]) wants_comment_notification = wtforms.BooleanField( description=_("Email me when others comment on my media")) wants_notifications = wtforms.BooleanField( @@ -113,3 +109,15 @@ class ChangePassForm(wtforms.Form): [wtforms.validators.Required(), wtforms.validators.Length(min=6, max=30)], id="password") + + +class ChangeEmailForm(wtforms.Form): + new_email = wtforms.TextField( + _('New email address'), + [wtforms.validators.Required(), + normalize_user_or_email_field(allow_user=False)]) + password = wtforms.PasswordField( + _('Password'), + [wtforms.validators.Required()], + description=_( + "Enter your password to prove you own this account.")) |