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

ease the validation on project phases

ulfertseae07d536bed
diff --git a/app/contracts/work_packages/base_contract.rb b/app/contracts/work_packages/base_contract.rb
index ff86b68d0be..10474fd0aee 100644
--- a/app/contracts/work_packages/base_contract.rb
+++ b/app/contracts/work_packages/base_contract.rb
@@ -559,7 +559,7 @@ module WorkPackages
def validate_phase_active_in_project
if model.project.present? &&
model.project_phase_definition_id.present? &&
- !(model.project_changed? && !model.project_phase_definition_changed?) &&
+ model.project_phase_definition_changed? &&
!project_definition_assignable?
errors.add :project_phase_id, :inclusion
end
diff --git a/spec/contracts/work_packages/update_contract_spec.rb b/spec/contracts/work_packages/update_contract_spec.rb
index 1a7bfd3e987..bdee5f002c0 100644
--- a/spec/contracts/work_packages/update_contract_spec.rb
+++ b/spec/contracts/work_packages/update_contract_spec.rb
@@ -343,6 +343,18 @@ RSpec.describe WorkPackages::UpdateContract do
it_behaves_like "contract is valid"
end
+ context "when not changing the value but changing a different attribute while the project phase is inactive" do
+ before do
+ work_package.project_phase_definition = persisted_inactive_project_phase.definition
+ work_package.save
+ work_package.reload
+
+ work_package.subject = "A new subject"
+ end
+
+ it_behaves_like "contract is valid"
+ end
+
context "when changing the value and assigning a project in which the phase is not active" do
before do
work_package.project_phase_definition = persisted_project_phase_definition