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

[#65740] Fix project phase exports

Tobias Dillmann2ce8301f1205
diff --git a/app/models/project/phase.rb b/app/models/project/phase.rb
index efaec980752..a6a49a92987 100644
--- a/app/models/project/phase.rb
+++ b/app/models/project/phase.rb
@@ -111,4 +111,6 @@ class Project::Phase < ApplicationRecord
def following_phases
@following_phases ||= project.available_phases.select { it.position > position }
end
+
+ def to_s; name end
end
diff --git a/app/models/queries/project_phase_definitions/database_queries.rb b/app/models/queries/project_phase_definitions/database_queries.rb
index 89ab8f1bba3..35c9097de15 100644
--- a/app/models/queries/project_phase_definitions/database_queries.rb
+++ b/app/models/queries/project_phase_definitions/database_queries.rb
@@ -46,13 +46,15 @@ module Queries::ProjectPhaseDefinitions
LEFT OUTER JOIN (
SELECT
ph.id,
+ ppd.position,
ph.project_id,
- ph.definition_id AS active_phase_definition_id
+ ph.definition_id AS project_phase_definition_id
FROM project_phases ph
+ LEFT OUTER JOIN project_phase_definitions ppd ON ppd.id = ph.definition_id
WHERE ph.project_id IN (#{projects_with_view_phases_permissions.to_sql})
AND ph.active = true
) AS active_phases
- ON active_phases.active_phase_definition_id = work_packages.project_phase_definition_id
+ ON active_phases.project_phase_definition_id = work_packages.project_phase_definition_id
AND active_phases.project_id = work_packages.project_id
SQL
end
diff --git a/app/models/queries/work_packages/filter/project_phase_filter.rb b/app/models/queries/work_packages/filter/project_phase_filter.rb
index 3c6bd798644..70aae60915f 100644
--- a/app/models/queries/work_packages/filter/project_phase_filter.rb
+++ b/app/models/queries/work_packages/filter/project_phase_filter.rb
@@ -62,7 +62,7 @@ class Queries::WorkPackages::Filter::ProjectPhaseFilter < Queries::WorkPackages:
end
def where
- operator_strategy.sql_for_field(values, :active_phases, :active_phase_definition_id)
+ operator_strategy.sql_for_field(values, :active_phases, :project_phase_definition_id)
end
private
diff --git a/app/models/queries/work_packages/selects/project_phase_select.rb b/app/models/queries/work_packages/selects/project_phase_select.rb
index e7d56c39fd6..cee1d350f55 100644
--- a/app/models/queries/work_packages/selects/project_phase_select.rb
+++ b/app/models/queries/work_packages/selects/project_phase_select.rb
@@ -33,7 +33,6 @@ class Queries::WorkPackages::Selects::ProjectPhaseSelect < Queries::WorkPackages
def initialize
super(:project_phase,
- association: :project_phase_definition,
group_by_column_name: :project_phase_definition,
sortable: sortable_statement,
groupable: group_by_statement,
@@ -43,11 +42,11 @@ class Queries::WorkPackages::Selects::ProjectPhaseSelect < Queries::WorkPackages
end
def groupable_select
- "#{group_by_statement} as project_phase_definition_id"
+ group_by_statement
end
def group_by_statement
- active_phase_null_case(true_case: "NULL", false_case: "project_phase_definitions.id")
+ "active_phases.project_phase_definition_id"
end
def order_for_count
@@ -67,7 +66,7 @@ class Queries::WorkPackages::Selects::ProjectPhaseSelect < Queries::WorkPackages
# We use the join alias from the group by join statement to ensure that work packages with an *inactive* project
# phase are treated like work packages *without* a project phase. In the result list, they will belong to the
# same group: without an active project phase.
- active_phase_null_case(true_case: "-1", false_case: "project_phase_definitions.position")
+ active_phase_null_case(true_case: "-1", false_case: "active_phases.position")
end
def self.instances(context = nil)