diff options
| author | Aditi <aditi.iitr@gmail.com> | 2013-07-16 06:48:33 +0530 |
|---|---|---|
| committer | Aditi <aditi.iitr@gmail.com> | 2013-07-16 06:48:33 +0530 |
| commit | 67d303ffa96a80da3a3cf48d2f9231bc1a087a19 (patch) | |
| tree | 8bd1af9ec13fed7c340a6329632bddf2d17e3fb6 /mediagoblin/plugins | |
| parent | 7b77f7e490a27de57a4dab5301662ef95d11b213 (diff) | |
| parent | 64ad0beea83b1f4b50462bcb67c54156fc9365a5 (diff) | |
| download | mediagoblin-67d303ffa96a80da3a3cf48d2f9231bc1a087a19.tar.lz mediagoblin-67d303ffa96a80da3a3cf48d2f9231bc1a087a19.tar.xz mediagoblin-67d303ffa96a80da3a3cf48d2f9231bc1a087a19.zip | |
merge with remote master branch of cweb.
Diffstat (limited to 'mediagoblin/plugins')
| -rw-r--r-- | mediagoblin/plugins/basic_auth/__init__.py | 5 | ||||
| -rw-r--r-- | mediagoblin/plugins/basic_auth/forms.py | 3 | ||||
| -rw-r--r-- | mediagoblin/plugins/openid/views.py | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/mediagoblin/plugins/basic_auth/__init__.py b/mediagoblin/plugins/basic_auth/__init__.py index c16d8855..33a554b0 100644 --- a/mediagoblin/plugins/basic_auth/__init__.py +++ b/mediagoblin/plugins/basic_auth/__init__.py @@ -59,7 +59,10 @@ def gen_password_hash(raw_pass, extra_salt=None): def check_password(raw_pass, stored_hash, extra_salt=None): - return auth_tools.bcrypt_check_password(raw_pass, stored_hash, extra_salt) + if stored_hash: + return auth_tools.bcrypt_check_password(raw_pass, + stored_hash, extra_salt) + return None def auth(): diff --git a/mediagoblin/plugins/basic_auth/forms.py b/mediagoblin/plugins/basic_auth/forms.py index 72d99dff..6cf01b38 100644 --- a/mediagoblin/plugins/basic_auth/forms.py +++ b/mediagoblin/plugins/basic_auth/forms.py @@ -41,3 +41,6 @@ class LoginForm(wtforms.Form): normalize_user_or_email_field()]) password = wtforms.PasswordField( _('Password')) + stay_logged_in = wtforms.BooleanField( + label='', + description=_('Stay logged in')) diff --git a/mediagoblin/plugins/openid/views.py b/mediagoblin/plugins/openid/views.py index 9566e38e..b639a4cb 100644 --- a/mediagoblin/plugins/openid/views.py +++ b/mediagoblin/plugins/openid/views.py @@ -342,7 +342,7 @@ def delete_openid(request): form.openid.errors.append( _('That OpenID is not registered to this account.')) - if not form.errors and not request.session['messages']: + if not form.errors and not request.session.get('messages'): # Okay to continue with deleting openid return_to = request.urlgen( 'mediagoblin.plugins.openid.finish_delete') |