diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-01-22 13:43:02 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-01-22 13:43:02 -0600 |
| commit | 79f7cfd900c115fd4c1e4fe8e50f6aad6a56160f (patch) | |
| tree | 13ff8e38e996682451271d5616ea88c91eb8590e /mediagoblin/edit/forms.py | |
| parent | 55a04f01b881830f164e8a1b0a695dead6cddba3 (diff) | |
| parent | dc4dfbde350fdd9eac50448e42f2c8b209dd6ea8 (diff) | |
| download | mediagoblin-79f7cfd900c115fd4c1e4fe8e50f6aad6a56160f.tar.lz mediagoblin-79f7cfd900c115fd4c1e4fe8e50f6aad6a56160f.tar.xz mediagoblin-79f7cfd900c115fd4c1e4fe8e50f6aad6a56160f.zip | |
Merge remote-tracking branch 'refs/remotes/spaetz/521_license_preference' into mergetest
Diffstat (limited to 'mediagoblin/edit/forms.py')
| -rw-r--r-- | mediagoblin/edit/forms.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py index 293c3bb2..2673967b 100644 --- a/mediagoblin/edit/forms.py +++ b/mediagoblin/edit/forms.py @@ -65,8 +65,19 @@ class EditAccountForm(wtforms.Form): "Enter your old password to prove you own this account.")) new_password = wtforms.PasswordField( _('New password'), - [wtforms.validators.Length(min=6, max=30)], + [ + wtforms.validators.Optional(), + wtforms.validators.Length(min=6, max=30) + ], id="password") + license_preference = wtforms.SelectField( + _('License preference'), + [ + wtforms.validators.Optional(), + wtforms.validators.AnyOf([lic[0] for lic in licenses_as_choices()]), + ], + 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")) |