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

close code review issues & hints https://github.com/opf/openproject/pull/19756#discussion_r2273316765 https://github.com/opf/openproject/pull/19756#discussion_r2273341315 https://github.com/opf/openproject/pull/19756#discussion_r2273363760 https://github.com/opf/openproject/pull/19756#discussion_r2273377147 https://github.com/opf/openproject/pull/19756#discussion_r2273402627 https://github.com/opf/openproject/pull/19756#discussion_r2273405467 https://github.com/opf/openproject/pull/19756#discussion_r2273443567 https://github.com/opf/openproject/pull/19756#discussion_r2273470141

as-ope766e78927c5
diff --git a/app/models/projects/exports/formatters/active.rb b/app/models/projects/exports/formatters/active.rb
index 9bb7236017a..5cc627a4b7a 100644
--- a/app/models/projects/exports/formatters/active.rb
+++ b/app/models/projects/exports/formatters/active.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
diff --git a/app/models/projects/exports/pdf.rb b/app/models/projects/exports/pdf.rb
index c321cb023ea..06fcf08b59e 100644
--- a/app/models/projects/exports/pdf.rb
+++ b/app/models/projects/exports/pdf.rb
@@ -35,7 +35,6 @@ module Projects::Exports
include Exports::PDF::Common::Attachments
include Exports::PDF::Common::Markdown
include Exports::PDF::Components::Page
- include Exports::PDF::Components::WpTable
include Exports::PDF::Components::Cover
include Projects::Exports::PDFExport::TableOfContent
include Projects::Exports::PDFExport::Report
@@ -64,7 +63,7 @@ module Projects::Exports
end
def title
- build_pdf_filename([heading].join("_"))
+ build_pdf_filename(heading)
end
def heading
diff --git a/app/models/projects/exports/pdf_export/info_map.rb b/app/models/projects/exports/pdf_export/info_map.rb
index e8abe59b69e..8377439b729 100644
--- a/app/models/projects/exports/pdf_export/info_map.rb
+++ b/app/models/projects/exports/pdf_export/info_map.rb
@@ -31,19 +31,16 @@
module Projects::Exports::PDFExport
module InfoMap
def build_flat_meta_infos_map(projects)
- infos_map = {}
- projects.each_with_index do |project, index|
- infos_map[project.id] = { level_path: [index + 1], level: 0, children: [], project: }
- end
+ infos_map = projects.map.with_index do |project, index|
+ [project.id, { level_path: [index + 1], level: 0, children: [], project: }]
+ end.to_h
[infos_map, projects.to_a]
end
def init_meta_infos_map_nodes(projects)
- infos_map = {}
- projects.each do |project|
- infos_map[project.id] = { level_path: [], level: 0, children: [], project: }
+ projects.to_h do |project|
+ [project.id, { level_path: [], level: 0, children: [], project: }]
end
- infos_map
end
def link_meta_infos_map_nodes(infos_map, projects)
diff --git a/app/models/projects/exports/pdf_export/report.rb b/app/models/projects/exports/pdf_export/report.rb
index e12c60818f1..8fa3eef235e 100644
--- a/app/models/projects/exports/pdf_export/report.rb
+++ b/app/models/projects/exports/pdf_export/report.rb
@@ -66,16 +66,15 @@ module Projects::Exports::PDFExport
end
def selects
- @selects = query
- .selects
- .reject { |s| s.is_a?(Queries::Selects::NotExistingSelect) }
+ query.selects.reject { |s| s.is_a?(Queries::Selects::NotExistingSelect) }
end
def write_project_detail_content(project)
- return if selects.empty?
+ export_selects = selects
+ return if export_selects.empty?
entries = []
- selects.each do |select|
+ export_selects.each do |select|
entries = process_select(project, select, entries)
end
write_table_entries(entries) unless entries.empty?
@@ -167,9 +166,7 @@ module Projects::Exports::PDFExport
end
def can_view_attribute?(_project, attribute)
- return false if attribute.nil? || %i[name favored].include?(attribute)
-
- true
+ attribute.nil? || %i[name favored].include?(attribute)
end
def user_can_view_project_phases?(project)