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
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
writable workspace_type attribute on project creation
ulferts34756614162f
diff --git a/app/contracts/projects/create_contract.rb b/app/contracts/projects/create_contract.rbindex b086115ccb3..ac2480932da 100644--- a/app/contracts/projects/create_contract.rb+++ b/app/contracts/projects/create_contract.rb@@ -30,7 +30,12 @@module Projectsclass CreateContract < BaseContract+ attribute :workspace_type do+ validate_workspace_type_included+ end+include AdminWritableTimestamps+# Projects update their updated_at timestamp due to awesome_nested_set# so allowing writing here would be useless.allow_writable_timestamps :created_at@@ -45,6 +50,12 @@ module Projectsprotected+ def validate_workspace_type_included+ # TODO: differentiate on allowed types based on permissions.+ # Permissions will need to be added: project, program, portfolio.+ errors.add(:workspace_type, :blank) if model.workspace_type.nil?+ end+def collect_available_custom_field_attributesmodel.all_visible_custom_fields.map(&:attribute_name)enddiff --git a/spec/contracts/projects/create_contract_spec.rb b/spec/contracts/projects/create_contract_spec.rbindex 29a09192b78..ebe663d0927 100644--- a/spec/contracts/projects/create_contract_spec.rb+++ b/spec/contracts/projects/create_contract_spec.rb@@ -41,7 +41,8 @@ RSpec.describe Projects::CreateContract dopublic: project_public,parent: project_parent,status_code: project_status_code,- status_explanation: project_status_explanation)+ status_explanation: project_status_explanation,+ workspace_type: project_workspace_type)endlet(:global_permissions) { [:add_project] }let(:validated_contract) do@@ -56,6 +57,30 @@ RSpec.describe Projects::CreateContract doit_behaves_like "contract is valid"end+ context "if workspace_type is nil" do+ let(:project_workspace_type) { nil }++ it_behaves_like "contract is invalid", workspace_type: %i(blank)+ end++ context "if workspace type is 'project'" do+ let(:project_workspace_type) { "project" }++ it_behaves_like "contract is valid"+ end++ context "if workspace type is 'program'" do+ let(:project_workspace_type) { "program" }++ it_behaves_like "contract is valid"+ end++ context "if workspace type is 'portfolio'" do+ let(:project_workspace_type) { "portfolio" }++ it_behaves_like "contract is valid"+ end+describe "permissions" doshared_examples "can write" dolet(:value) { 1 }diff --git a/spec/contracts/projects/shared_contract_examples.rb b/spec/contracts/projects/shared_contract_examples.rbindex 36055f4cd81..a1473007e92 100644--- a/spec/contracts/projects/shared_contract_examples.rb+++ b/spec/contracts/projects/shared_contract_examples.rb@@ -52,6 +52,7 @@ RSpec.shared_examples_for "project contract" dolet(:project_public) { true }let(:project_status_code) { "on_track" }let(:project_status_explanation) { "some explanation" }+ let(:project_workspace_type) { "project" }let(:project_parent) dobuild_stubbed(:project)enddiff --git a/spec/contracts/projects/update_contract_spec.rb b/spec/contracts/projects/update_contract_spec.rbindex 31e36a4743a..29e4aac1933 100644--- a/spec/contracts/projects/update_contract_spec.rb+++ b/spec/contracts/projects/update_contract_spec.rb@@ -46,7 +46,8 @@ RSpec.describe Projects::UpdateContract doactive: project_active,public: project_public,status_code: project_status_code,- status_explanation: project_status_explanation).tap do |p|+ status_explanation: project_status_explanation,+ workspace_type: project_workspace_type).tap do |p|allow(p).to receive_messages(available_custom_fields: [custom_field],all_available_custom_fields: [custom_field])next unless project_changed@@ -69,6 +70,14 @@ RSpec.describe Projects::UpdateContract doit_behaves_like "contract is invalid", identifier: %i(blank)end+ context "if workspace_type is changed" do+ before do+ project.workspace_type = "portfolio"+ end++ it_behaves_like "contract is invalid", workspace_type: :error_readonly+ end+describe "permissions" docontext "with edit_project_attributes" dolet(:project_permissions) { %i(edit_project_attributes) }