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
Apply new item group DSL to further action menus
Jan Sandbrinkbadec143ccd6
diff --git a/lib/redmine/menu_manager/top_menu/quick_add_menu.rb b/lib/redmine/menu_manager/top_menu/quick_add_menu.rbindex 3ecfe5c7bf7..3181cdd04ad 100644--- a/lib/redmine/menu_manager/top_menu/quick_add_menu.rb+++ b/lib/redmine/menu_manager/top_menu/quick_add_menu.rb@@ -30,6 +30,7 @@module Redmine::MenuManager::TopMenu::QuickAddMenuinclude OpenProject::StaticRouting::UrlHelpers+ include OpPrimer::ComponentHelpersdef render_quick_add_menureturn unless show_quick_add_menu?@@ -52,11 +53,8 @@ module Redmine::MenuManager::TopMenu::QuickAddMenurender(Primer::Beta::Octicon.new(icon: "triangle-down", aria: { label: I18n.t("menus.quick_add.label") }))end- add_first_level_items(menu)- if first_level_menu_items_for(:quick_add_menu, @project).present? && work_package_quick_add_items.present?- menu.with_divider- end- add_second_level_items(menu)+ with_item_group(menu) { add_first_level_items(menu) }+ with_item_group(menu) { add_second_level_items(menu) }endenddiff --git a/modules/costs/app/components/my/time_tracking/time_entry_row.rb b/modules/costs/app/components/my/time_tracking/time_entry_row.rbindex 098d68d7e50..066e6de54f9 100644--- a/modules/costs/app/components/my/time_tracking/time_entry_row.rb+++ b/modules/costs/app/components/my/time_tracking/time_entry_row.rb@@ -45,16 +45,15 @@ module Myrender(Primer::Alpha::ActionMenu.new) do |menu|menu.with_show_button(icon: "kebab-horizontal", "aria-label": t("label_more"), scheme: :invisible)- if time_entry.ongoing?- stop_timer_action_button(menu)- else- edit_action_button(menu)+ with_item_group(menu) do+ if time_entry.ongoing?+ stop_timer_action_button(menu)+ else+ edit_action_button(menu)+ endend- if can_delete_time_entry?- menu.with_divider- delete_action_button(menu)- end+ with_item_group(menu) { delete_action_button(menu) } if can_delete_time_entry?endenddiff --git a/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.html.erb b/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.html.erbindex c88330ad4a1..246a67d1300 100644--- a/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.html.erb+++ b/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.html.erb@@ -65,33 +65,25 @@test_selector: "op-meeting-agenda-actions")- edit_action_item(menu)- if !in_backlog?- copy_action_item(menu)+ with_item_group(menu) do+ edit_action_item(menu)+ copy_action_item(menu) unless in_backlog?end- menu.with_divider if note_or_outcome_action_added? && editable?-- add_note_action_item(menu) if add_note_action?- add_outcome_action_item(menu) if add_outcome_action?-- unless first? && last?- menu.with_divider if editable?- move_actions(menu)+ with_item_group(menu) do+ add_note_action_item(menu) if add_note_action?+ add_outcome_action_item(menu) if add_outcome_action?end- menu.with_divider if move_to_different_section_or_meeting_action_added?+ with_item_group(menu) { move_actions(menu) } unless first? && last?- if !in_template? || in_backlog?+ with_item_group(menu) domove_to_current_meeting_action_item(menu) if in_backlog?- move_to_backlog_action_item(menu) if !in_backlog?- end- if move_to_next_meeting_enabled?- move_to_next_meeting_action_item(menu)+ move_to_backlog_action_item(menu) if !in_template? && !in_backlog?+ move_to_next_meeting_action_item(menu) if move_to_next_meeting_enabled?end- menu.with_divider if editable?- delete_action_item(menu)+ with_item_group(menu) { delete_action_item(menu) }endenddiff --git a/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.rb b/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.rbindex a346eefb9e1..5265921777c 100644--- a/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.rb+++ b/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.rb@@ -247,16 +247,6 @@ module MeetingAgendaItems@meeting.templated?end- def note_or_outcome_action_added?- (@meeting_agenda_item.editable? && @meeting_agenda_item.notes.blank?) || add_outcome_action?- end-- def move_to_different_section_or_meeting_action_added?- return false unless editable?-- !in_template? || in_backlog? || move_to_next_meeting_enabled?- end-def editable?@editable ||= @meeting_agenda_item.editable? && can_manage_agendas?enddiff --git a/modules/meeting/app/components/meeting_agenda_items/outcomes/show_notes_component.html.erb b/modules/meeting/app/components/meeting_agenda_items/outcomes/show_notes_component.html.erbindex 6737f526354..2f74b544350 100644--- a/modules/meeting/app/components/meeting_agenda_items/outcomes/show_notes_component.html.erb+++ b/modules/meeting/app/components/meeting_agenda_items/outcomes/show_notes_component.html.erb@@ -22,10 +22,14 @@ml: 2,test_selector: "op-meeting-outcome-actions")- edit_action_item(menu)- copy_action_item(menu)- menu.with_divider if edit_enabled?- delete_action_item(menu)+ with_item_group(menu) do+ edit_action_item(menu)+ copy_action_item(menu)+ end++ with_item_group(menu) do+ delete_action_item(menu)+ endendendenddiff --git a/modules/meeting/app/components/meeting_sections/header_component.html.erb b/modules/meeting/app/components/meeting_sections/header_component.html.erbindex fa6ce17798e..3ee728a6f9c 100644--- a/modules/meeting/app/components/meeting_sections/header_component.html.erb+++ b/modules/meeting/app/components/meeting_sections/header_component.html.erb@@ -26,16 +26,16 @@if editable?render(Primer::Alpha::ActionMenu.new(data: { test_selector: "meeting-section-action-menu" })) do |menu|menu.with_show_button(icon: "kebab-horizontal", "aria-label": t("settings.project_attributes.label_section_actions"), scheme: :invisible)- edit_action_item(menu)- menu.with_divider- add_agenda_item_action(menu)- add_work_package_action(menu)- unless first? && last?- menu.with_divider- move_actions(menu)++ with_item_group(menu) { edit_action_item(menu) }++ with_item_group(menu) do+ add_agenda_item_action(menu)+ add_work_package_action(menu)end- menu.with_divider- delete_action_item(menu)++ with_item_group(menu) { move_actions(menu) } unless first? && last?+ with_item_group(menu) { delete_action_item(menu) }endendend