OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Split Login and SSO tab in authentication settings
Jan Sandbrink83db8e99d2c2
diff --git a/app/views/admin/settings/authentication_settings/_login.html.erb b/app/views/admin/settings/authentication_settings/_login.html.erbindex 42ae953af15..8273a57a360 100644--- a/app/views/admin/settings/authentication_settings/_login.html.erb+++ b/app/views/admin/settings/authentication_settings/_login.html.erb@@ -29,33 +29,9 @@ See COPYRIGHT and LICENSE files for more details.<%=settings_primer_form_with(scope: :settings,- url: admin_settings_authentication_path(tab: params[:tab]),- method: :patch) do |f|+ url: admin_settings_authentication_path(tab: params[:tab]),+ method: :patch) do |f|render_inline_settings_form(f) do |form|- form.select_list(- name: :omniauth_direct_login_provider,- input_width: :medium,- label: I18n.t(:setting_omniauth_direct_login_provider),- caption: I18n.t(- "settings.authentication.omniauth_direct_login_hint_html",- internal_path: internal_signin_url- ).html_safe,- include_blank: I18n.t(:label_none_parentheses)- ) do |select|- AuthProvider- .where(available: true)- .order("lower(display_name) ASC")- .select(:type, :display_name, :slug)- .to_a- .each do |provider|- select.option(- value: provider.slug,- label: "#{provider.display_name} (#{provider.human_type})",- selected: Setting.omniauth_direct_login_provider == provider.slug- )- end- end-form.select_list(name: :autologin,input_width: :medium,diff --git a/app/views/admin/settings/authentication_settings/_sso.html.erb b/app/views/admin/settings/authentication_settings/_sso.html.erbnew file mode 100644index 00000000000..dc8a8697277--- /dev/null+++ b/app/views/admin/settings/authentication_settings/_sso.html.erb@@ -0,0 +1,62 @@+<%#-- copyright+OpenProject is an open source project management software.+Copyright (C) the OpenProject GmbH++This program is free software; you can redistribute it and/or+modify it under the terms of the GNU General Public License version 3.++OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:+Copyright (C) 2006-2013 Jean-Philippe Lang+Copyright (C) 2010-2013 the ChiliProject Team++This program is free software; you can redistribute it and/or+modify it under the terms of the GNU General Public License+as published by the Free Software Foundation; either version 2+of the License, or (at your option) any later version.++This program is distributed in the hope that it will be useful,+but WITHOUT ANY WARRANTY; without even the implied warranty of+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+GNU General Public License for more details.++You should have received a copy of the GNU General Public License+along with this program; if not, write to the Free Software+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.++See COPYRIGHT and LICENSE files for more details.++++#%>++<%=+ settings_primer_form_with(scope: :settings,+ url: admin_settings_authentication_path(tab: params[:tab]),+ method: :patch) do |f|+ render_inline_settings_form(f) do |form|+ form.select_list(+ name: :omniauth_direct_login_provider,+ input_width: :medium,+ label: I18n.t(:setting_omniauth_direct_login_provider),+ caption: I18n.t(+ "settings.authentication.omniauth_direct_login_hint_html",+ internal_path: internal_signin_url+ ).html_safe,+ include_blank: I18n.t(:label_none_parentheses)+ ) do |select|+ AuthProvider+ .where(available: true)+ .order("lower(display_name) ASC")+ .select(:type, :display_name, :slug)+ .to_a+ .each do |provider|+ select.option(+ value: provider.slug,+ label: "#{provider.display_name} (#{provider.human_type})",+ selected: Setting.omniauth_direct_login_provider == provider.slug+ )+ end+ end++ form.submit+ end+ end+%>diff --git a/app/views/admin/settings/authentication_settings/show.html.erb b/app/views/admin/settings/authentication_settings/show.html.erbindex 2b33e0ad750..b5e2154726c 100644--- a/app/views/admin/settings/authentication_settings/show.html.erb+++ b/app/views/admin/settings/authentication_settings/show.html.erb@@ -32,9 +32,15 @@ See COPYRIGHT and LICENSE files for more details.{name: :login,path: admin_settings_authentication_path(tab: :login),- label: :"settings.authentication.login_and_sso",+ label: :"settings.authentication.login",partial: "admin/settings/authentication_settings/login"},+ {+ name: :sso,+ path: admin_settings_authentication_path(tab: :sso),+ label: :"settings.authentication.sso",+ partial: "admin/settings/authentication_settings/sso"+ },{name: :registration,path: admin_settings_authentication_path(tab: :registration),diff --git a/config/locales/en.yml b/config/locales/en.ymlindex 10e81ca5d50..ebbc635331d 100644--- a/config/locales/en.yml+++ b/config/locales/en.yml@@ -4215,9 +4215,9 @@ en:settings:authentication:- login_and_sso: "Login and SSO"+ login: "Login"registration: "Registration"- single_sign_on: "Single Sign-On"+ sso: "Single Sign-On (SSO)"omniauth_direct_login_hint_html: >If this option is active, login requests will redirect to the configured omniauth provider.The login dropdown and sign-in page will be disabled.