From ecef6ad8ac0724b311c545412518b8fd1dc72b79 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Thu, 20 May 2021 16:02:37 -0400 Subject: [PATCH] Fix case statement for selection of wb1 login UI, refs #17499 Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- .../app/views/users/welcome.html.erb | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/apps/workbench/app/views/users/welcome.html.erb b/apps/workbench/app/views/users/welcome.html.erb index 0b98909e67..92fd6dad46 100644 --- a/apps/workbench/app/views/users/welcome.html.erb +++ b/apps/workbench/app/views/users/welcome.html.erb @@ -47,18 +47,9 @@ SPDX-License-Identifier: AGPL-3.0 %> <%= raw(Rails.configuration.Workbench.WelcomePageHTML) %> <% case %> - <% when Rails.configuration.Login.Google.Enable %> - <% when Rails.configuration.Login.OpenIDConnect.Enable %> - <% when Rails.configuration.Login.SSO.Enable %> -
- <%= link_to arvados_api_client.arvados_login_url(return_to: request.url), class: "btn btn-primary" do %> - Log in to <%= Rails.configuration.Workbench.SiteName %> - - <% end %> -
- <% when Rails.configuration.Login.PAM.Enable %> - <% when Rails.configuration.Login.LDAP.Enable %> - <% when Rails.configuration.Login.Test.Enable %> + <% when Rails.configuration.Login.PAM.Enable, + Rails.configuration.Login.LDAP.Enable, + Rails.configuration.Login.Test.Enable %>

username

+ <% else %> +
+ <%= link_to arvados_api_client.arvados_login_url(return_to: request.url), class: "btn btn-primary" do %> + Log in to <%= Rails.configuration.Workbench.SiteName %> + + <% end %> +
<% end %> -- 2.30.2