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

Add and use conditionally overriden section title

Mir Bhatiad9ca47e13a44
diff --git a/modules/meeting/app/components/meeting_sections/backlogs/header_component.html.erb b/modules/meeting/app/components/meeting_sections/backlogs/header_component.html.erb
index 049fc7e30f7..54f48c444a0 100644
--- a/modules/meeting/app/components/meeting_sections/backlogs/header_component.html.erb
+++ b/modules/meeting/app/components/meeting_sections/backlogs/header_component.html.erb
@@ -7,7 +7,7 @@
box: @box, collapsed: @collapsed
)
) do |header|
- header.with_title(font_weight: :bold) { title }
+ header.with_title(font_weight: :bold) { @backlog.title }
header.with_description { description }
header.with_count(count: @backlog.agenda_items.count)
end
diff --git a/modules/meeting/app/components/meeting_sections/backlogs/header_component.rb b/modules/meeting/app/components/meeting_sections/backlogs/header_component.rb
index ac180633811..a9740226af0 100644
--- a/modules/meeting/app/components/meeting_sections/backlogs/header_component.rb
+++ b/modules/meeting/app/components/meeting_sections/backlogs/header_component.rb
@@ -55,14 +55,6 @@ module MeetingSections
@current_meeting.in_progress?
end
- def title
- if @meeting.recurring?
- I18n.t(:label_series_backlog)
- else
- I18n.t(:label_agenda_backlog)
- end
- end
-
def description
if @meeting.recurring?
I18n.t(:text_series_backlog)
diff --git a/modules/meeting/app/forms/meeting/add_to_section.rb b/modules/meeting/app/forms/meeting/add_to_section.rb
index f495a47f859..f5c197f57c2 100644
--- a/modules/meeting/app/forms/meeting/add_to_section.rb
+++ b/modules/meeting/app/forms/meeting/add_to_section.rb
@@ -78,8 +78,6 @@ class Meeting::AddToSection < ApplicationForm
end
def option_title(item)
- # Keep order (Bug #67381)
- return I18n.t("label_series_backlog") if item.backlog? && meeting.recurring?
return I18n.t("meeting_section.untitled_title") if item.title.blank? && !item.backlog?
item.title
diff --git a/modules/meeting/app/models/meeting_section.rb b/modules/meeting/app/models/meeting_section.rb
index d0e1aea321d..4f3117123f6 100644
--- a/modules/meeting/app/models/meeting_section.rb
+++ b/modules/meeting/app/models/meeting_section.rb
@@ -42,6 +42,12 @@ class MeetingSection < ApplicationRecord
scope :backlog, -> { where(backlog: true) }
+ def title
+ return super unless backlog?
+
+ meeting.recurring? ? I18n.t(:label_series_backlog) : I18n.t(:label_agenda_backlog)
+ end
+
def untitled?
title.blank?
end