Fix accounts_home and login to display no-password correctly.

This fixes the /register/ (accounts_home) and /login/ pages to not
display the login form if login isn’t allowed at the organization level.
This commit is contained in:
Brock Whittaker
2017-05-11 17:24:28 -07:00
committed by Tim Abbott
parent c7f710b8d4
commit 07ecf971c6
2 changed files with 44 additions and 41 deletions

View File

@@ -44,6 +44,7 @@ $(function () {
configure authentication backends.</p>
</div>
{% else %}
{% if password_auth_enabled %}
<form class="form-inline" id="send_confirm" name="email_form"
action="{{ current_url() }}" method="post">
{{ csrf_input }}
@@ -68,6 +69,7 @@ $(function () {
{% if any_oauth_backend_enabled %}
<div class="or">or</div>
{% endif %}
{% endif %}
{% if google_auth_enabled %}
<div class="register-google">

View File

@@ -129,12 +129,13 @@ autofocus('#id_username');
<button type="submit" name="button" class="full-width">{{ _("Sign in") }}</button>
</form>
{% endif %}
{% if any_oauth_backend_enabled %}
<div class="or">or</div>
{% endif %}
{% endif %} <!-- if password_auth_enabled -->
{% if google_auth_enabled %}
<div class="login-google">
<a href="{{ url('zerver.views.auth.start_google_oauth2') }}">