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
[#66132] remove extra buttons from submitorcancel form
Eric Schuberte7fb9fda5350
diff --git a/modules/openid_connect/app/components/openid_connect/providers/sections/form_component.html.erb b/modules/openid_connect/app/components/openid_connect/providers/sections/form_component.html.erbindex 03952e4c5ad..292727ea5de 100644--- a/modules/openid_connect/app/components/openid_connect/providers/sections/form_component.html.erb+++ b/modules/openid_connect/app/components/openid_connect/providers/sections/form_component.html.erb@@ -29,15 +29,12 @@endflex.with_row(mt: 4) do- concat(- render(- OpenIDConnect::Providers::SubmitOrCancelForm.new(- form,- provider:,- submit_button_options: { label: button_label },- cancel_button_options: { hidden: edit_mode },- extra_content: @extra_buttons- )+ render(+ OpenIDConnect::Providers::SubmitOrCancelForm.new(+ form,+ provider:,+ submit_button_options: { label: button_label },+ cancel_button_options: { hidden: edit_mode }))enddiff --git a/modules/openid_connect/app/components/openid_connect/providers/sections/form_component.rb b/modules/openid_connect/app/components/openid_connect/providers/sections/form_component.rbindex 8d3b20605ca..f8afc277d75 100644--- a/modules/openid_connect/app/components/openid_connect/providers/sections/form_component.rb+++ b/modules/openid_connect/app/components/openid_connect/providers/sections/form_component.rb@@ -42,8 +42,7 @@ module OpenIDConnect::Providers::Sectionsbanner_scheme: :default,next_edit_state: nil,edit_mode: nil,- fetch_metadata: false,- extra_buttons: nil)+ fetch_metadata: false)super(provider)@edit_state = edit_state@@ -54,7 +53,6 @@ module OpenIDConnect::Providers::Sections@banner = banner@banner_scheme = banner_scheme@fetch_metadata = fetch_metadata- @extra_buttons = extra_buttonsenddef urldiff --git a/modules/openid_connect/app/components/openid_connect/providers/submit_or_cancel_form.rb b/modules/openid_connect/app/components/openid_connect/providers/submit_or_cancel_form.rbindex 3c35a2fc23c..9d10adea4fa 100644--- a/modules/openid_connect/app/components/openid_connect/providers/submit_or_cancel_form.rb+++ b/modules/openid_connect/app/components/openid_connect/providers/submit_or_cancel_form.rb@@ -43,17 +43,15 @@ module OpenIDConnectf.group(layout: :horizontal) do |button_group|button_group.submit(**@submit_button_options) unless @provider.seeded_from_env?button_group.button(**@cancel_button_options) unless @cancel_button_options[:hidden]- button_group.html_content(&@extra_content) if @extra_contentendend- def initialize(provider:, state: nil, submit_button_options: {}, cancel_button_options: {}, extra_content: nil)+ def initialize(provider:, state: nil, submit_button_options: {}, cancel_button_options: {})super()@state = state@provider = provider@submit_button_options = default_submit_button_options.merge(submit_button_options)@cancel_button_options = default_cancel_button_options.merge(cancel_button_options)- @extra_content = extra_contentendprivatediff --git a/modules/openid_connect/app/components/openid_connect/providers/view_component.html.erb b/modules/openid_connect/app/components/openid_connect/providers/view_component.html.erbindex a56bdcad832..257d611510f 100644--- a/modules/openid_connect/app/components/openid_connect/providers/view_component.html.erb+++ b/modules/openid_connect/app/components/openid_connect/providers/view_component.html.erb@@ -270,8 +270,7 @@edit_state:,next_edit_state: :claims,edit_mode:,- heading: nil,- extra_buttons: -> { render(OpenIDConnect::Groups::MatchPreviewDialogComponent.new) }+ heading: nil))else@@ -281,7 +280,7 @@target_state: :group_mapping,view_mode:,heading: t("openid_connect.providers.label_group_mapping"),- description: t("openid_connect.providers.section_texts.group_mapping"),+ description: t("openid_connect.providers.section_texts.group_mapping")))end