diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-08-25 13:23:27 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-08-25 13:23:27 -0500 |
| commit | 6c3d383bbb0af1ca7ac2ec2b229d148e947608dd (patch) | |
| tree | 6e59e531bf5a2932d2282de305f96d4c54b297c7 /mediagoblin/edit/forms.py | |
| parent | e8eec575f3a1d893036ce9b3356d2f56fd15016d (diff) | |
| parent | c9f9536cdf32ef597216af0ca7ba25adee799dbb (diff) | |
| download | mediagoblin-6c3d383bbb0af1ca7ac2ec2b229d148e947608dd.tar.lz mediagoblin-6c3d383bbb0af1ca7ac2ec2b229d148e947608dd.tar.xz mediagoblin-6c3d383bbb0af1ca7ac2ec2b229d148e947608dd.zip | |
Merge remote-tracking branch 'refs/remotes/rodney757/email'
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.")) |