diff options
| author | Joar Wandborg <git@wandborg.com> | 2012-06-10 15:53:46 +0200 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2012-06-10 15:53:46 +0200 |
| commit | 879ff4bde6afaee8bf5bdc2a0e659d66e767d424 (patch) | |
| tree | 71c9031f785f490f82d2fb7360b72b0f6007e2fe /mediagoblin/edit/forms.py | |
| parent | a855e92a985a9bdc9c5062cad268eba3d8e19f84 (diff) | |
| parent | fa72e516897a370b1e47e5f0ff17155990cd2414 (diff) | |
| download | mediagoblin-879ff4bde6afaee8bf5bdc2a0e659d66e767d424.tar.lz mediagoblin-879ff4bde6afaee8bf5bdc2a0e659d66e767d424.tar.xz mediagoblin-879ff4bde6afaee8bf5bdc2a0e659d66e767d424.zip | |
Merge remote-tracking branch 'is_derek/bug405_email_notifications_for_comments' into notifications-merge
Conflicts:
mediagoblin/db/mongo/migrations.py
Diffstat (limited to 'mediagoblin/edit/forms.py')
| -rw-r--r-- | mediagoblin/edit/forms.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py index ca52f298..e8fb450e 100644 --- a/mediagoblin/edit/forms.py +++ b/mediagoblin/edit/forms.py @@ -61,14 +61,15 @@ class EditProfileForm(wtforms.Form): class EditAccountForm(wtforms.Form): old_password = wtforms.PasswordField( _('Old password'), - [wtforms.validators.Required()], description=_( "Enter your old password to prove you own this account.")) new_password = wtforms.PasswordField( _('New password'), - [wtforms.validators.Required(), - wtforms.validators.Length(min=6, max=30)], + [wtforms.validators.Length(min=6, max=30)], id="password") + wants_comment_notification = wtforms.BooleanField( + _('Comment notification?'), + description=_("Check this box to be emailed when someone else comments on your media.")) class EditAttachmentsForm(wtforms.Form): |