diff options
| author | Aditi <aditi.iitr@gmail.com> | 2013-06-26 22:13:23 +0530 |
|---|---|---|
| committer | Aditi <aditi.iitr@gmail.com> | 2013-06-26 22:13:23 +0530 |
| commit | 054ef9a76a2ca73c0ca3cb8325a01cc981a39ddd (patch) | |
| tree | b8890b62d50cfc20a7d9af7d86d6ceb0a29eb5fd /mediagoblin/edit/forms.py | |
| parent | 2719d546a57c2332e36cc056ac80ec5d79672c1a (diff) | |
| parent | 491f2007f5d1f5f595c37491b7f9c0c2b4c93963 (diff) | |
| download | mediagoblin-054ef9a76a2ca73c0ca3cb8325a01cc981a39ddd.tar.lz mediagoblin-054ef9a76a2ca73c0ca3cb8325a01cc981a39ddd.tar.xz mediagoblin-054ef9a76a2ca73c0ca3cb8325a01cc981a39ddd.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/edit/forms.py')
| -rw-r--r-- | mediagoblin/edit/forms.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py index 3b2486de..e0147a0c 100644 --- a/mediagoblin/edit/forms.py +++ b/mediagoblin/edit/forms.py @@ -16,9 +16,11 @@ import wtforms -from mediagoblin.tools.text import tag_length_validator, TOO_LONG_TAG_WARNING +from mediagoblin.tools.text import tag_length_validator from mediagoblin.tools.translate import lazy_pass_to_ugettext as _ from mediagoblin.tools.licenses import licenses_as_choices +from mediagoblin.auth.forms import normalize_user_or_email_field + class EditForm(wtforms.Form): title = wtforms.TextField( @@ -59,6 +61,13 @@ 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( + label='', + description=_("Email me when others comment on my media")) license_preference = wtforms.SelectField( _('License preference'), [ @@ -67,8 +76,6 @@ class EditAccountForm(wtforms.Form): ], choices=licenses_as_choices(), description=_('This will be your default license on upload forms.')) - wants_comment_notification = wtforms.BooleanField( - label=_("Email me when others comment on my media")) class EditAttachmentsForm(wtforms.Form): |