diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-09-19 16:04:23 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-09-19 16:04:23 -0500 |
| commit | 74ae6fb0b620c2f899e2c97ba5f6af105103df6f (patch) | |
| tree | 1fc5a7634299ba221858536a12d3fa8066a1898f /mediagoblin/plugins/openid | |
| parent | 3dc6184167691d390f016c2b73fd6a9887955102 (diff) | |
| parent | f9931418d65c7823e13bc45f647a682ddf3b8632 (diff) | |
| download | mediagoblin-74ae6fb0b620c2f899e2c97ba5f6af105103df6f.tar.lz mediagoblin-74ae6fb0b620c2f899e2c97ba5f6af105103df6f.tar.xz mediagoblin-74ae6fb0b620c2f899e2c97ba5f6af105103df6f.zip | |
Merge remote-tracking branch 'refs/remotes/rodney757/auth_refactor'
Conflicts:
mediagoblin/auth/views.py
mediagoblin/edit/forms.py
mediagoblin/templates/mediagoblin/edit/edit_account.html
Diffstat (limited to 'mediagoblin/plugins/openid')
| -rw-r--r-- | mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html | 4 | ||||
| -rw-r--r-- | mediagoblin/plugins/openid/views.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html b/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html index 8d74c2b9..193a3b2d 100644 --- a/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html +++ b/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html @@ -20,8 +20,8 @@ {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% block mediagoblin_head %} - <script type="text/javascript" - src="{{ request.staticdirect('/js/autofilledin_password.js') }}"></script> + {{ super() }} + {% template_hook("fp_head") %} {% endblock %} {% block title -%} diff --git a/mediagoblin/plugins/openid/views.py b/mediagoblin/plugins/openid/views.py index b639a4cb..bb2de7ab 100644 --- a/mediagoblin/plugins/openid/views.py +++ b/mediagoblin/plugins/openid/views.py @@ -195,11 +195,11 @@ def finish_login(request): return redirect(request, "index") else: # No user, need to register - if not mg_globals.app.auth: + if not mg_globals.app_config['allow_registration']: messages.add_message( request, messages.WARNING, - _('Sorry, authentication is disabled on this instance.')) + _('Sorry, registration is disabled on this instance.')) return redirect(request, 'index') # Get email and nickname from response |