Skip to content

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

Update backlog directly when clearing it

Mir Bhatia051b974438d7
diff --git a/modules/meeting/app/controllers/meeting_sections_controller.rb b/modules/meeting/app/controllers/meeting_sections_controller.rb
index e9ae958cf6d..ddec61fafda 100644
--- a/modules/meeting/app/controllers/meeting_sections_controller.rb
+++ b/modules/meeting/app/controllers/meeting_sections_controller.rb
@@ -182,7 +182,6 @@ class MeetingSectionsController < ApplicationController
def clear_backlog
errors = []
- meeting_section = @meeting.backlog
@meeting.backlog.agenda_items.each do |item|
call = ::MeetingAgendaItems::DeleteService
.new(user: current_user, model: item)
@@ -191,7 +190,7 @@ class MeetingSectionsController < ApplicationController
errors << call.errors unless call.success?
end
- update_section_via_turbo_stream(collapsed: true, meeting_section:, current_occurrence: @current_occurrence)
+ update_backlog_via_turbo_stream(meeting: @current_occurrence, collapsed: true)
render_error_flash_message_via_turbo_stream(message: t("text_backlog_clear_error")) if errors.any?
respond_with_turbo_streams
diff --git a/modules/meeting/spec/features/meeting_backlogs_spec.rb b/modules/meeting/spec/features/meeting_backlogs_spec.rb
index d382eaf63e3..8b9f60a06c4 100644
--- a/modules/meeting/spec/features/meeting_backlogs_spec.rb
+++ b/modules/meeting/spec/features/meeting_backlogs_spec.rb
@@ -199,6 +199,10 @@ RSpec.describe "Meeting Backlogs", :js do
show_page.select_action(agenda_item, I18n.t(:label_agenda_item_move_to_backlog))
show_page.clear_backlog
show_page.expect_backlog collapsed: true
+
+ # expect all agenda items to be removed (Bug #67844)
+ show_page.click_on_backlog
+ show_page.expect_empty_backlog
end
end
end
@@ -344,6 +348,10 @@ RSpec.describe "Meeting Backlogs", :js do
first_occurrence_page.select_action(agenda_item, I18n.t(:label_agenda_item_move_to_backlog))
first_occurrence_page.clear_backlog
first_occurrence_page.expect_series_backlog collapsed: true
+
+ # expect all agenda items to be removed (Bug #67844)
+ first_occurrence_page.click_on_backlog
+ first_occurrence_page.expect_empty_backlog
end
it "allow items to be moved from multiple occurrences to the series backlog and vice versa" do