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 program creation form and global permission.

Dombi Attila7b1fd5f09a3a
diff --git a/app/components/projects/index_sub_header_component.rb b/app/components/projects/index_sub_header_component.rb
index 742461c65e2..33ff18d3189 100644
--- a/app/components/projects/index_sub_header_component.rb
+++ b/app/components/projects/index_sub_header_component.rb
@@ -77,6 +77,8 @@ module Projects
new_project_path
when Project.workspace_types[:portfolio]
new_portfolio_path
+ when Project.workspace_types[:program]
+ new_program_path
end
end
@@ -90,6 +92,8 @@ module Projects
:project
when Project.workspace_types[:portfolio]
:briefcase
+ when Project.workspace_types[:program]
+ :"project-roadmap"
end
end
@@ -97,6 +101,7 @@ module Projects
allowed_types = []
allowed_types << Project.workspace_types[:project] if @current_user.allowed_globally?(:add_project)
allowed_types << Project.workspace_types[:portfolio] if @current_user.allowed_globally?(:add_portfolios) && OpenProject::FeatureDecisions.portfolio_models_active?
+ allowed_types << Project.workspace_types[:program] if @current_user.allowed_globally?(:add_programs) && OpenProject::FeatureDecisions.portfolio_models_active?
allowed_types
end
diff --git a/app/contracts/projects/create_contract.rb b/app/contracts/projects/create_contract.rb
index 1cc02437b87..7858e446bfa 100644
--- a/app/contracts/projects/create_contract.rb
+++ b/app/contracts/projects/create_contract.rb
@@ -74,6 +74,8 @@ module Projects
validate_user_allowed_to_manage_projects
elsif model.portfolio?
validate_user_allowed_to_manage_portfolios
+ elsif model.program?
+ validate_user_allowed_to_manage_programs
end
end
@@ -83,6 +85,12 @@ module Projects
end
end
+ def validate_user_allowed_to_manage_programs
+ unless user.allowed_globally?(:add_programs)
+ errors.add :base, :error_unauthorized
+ end
+ end
+
def validate_user_allowed_to_manage_projects
unless user.allowed_globally?(:add_project) ||
(model.parent && user.allowed_in_project?(:add_subprojects, model.parent))
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 3664278b822..d57cdb60244 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -42,7 +42,7 @@ class ProjectsController < ApplicationController
before_action :not_authorized_on_feature_flag_inactive,
only: %i[new create],
if: -> {
- params[:workspace_type] == Project.workspace_types[:portfolio]
+ params[:workspace_type].in?(Project.workspace_types.values_at(:program, :portfolio))
}
before_action :find_optional_template, only: %i[new create]
before_action :find_optional_parent, only: :new
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 9c17262edd3..601bdfeaf50 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -94,6 +94,8 @@ module ProjectsHelper
I18n.t(:label_project_new)
elsif workspace.portfolio?
I18n.t(:label_portfolio_new)
+ elsif workspace.program?
+ I18n.t(:label_program_new)
end
end
end
diff --git a/app/models/projects/scopes/assignable_parents.rb b/app/models/projects/scopes/assignable_parents.rb
index 387a18330c1..01c6e60e732 100644
--- a/app/models/projects/scopes/assignable_parents.rb
+++ b/app/models/projects/scopes/assignable_parents.rb
@@ -34,7 +34,7 @@ module Projects::Scopes
class_methods do
def assignable_parents(user, project)
- if project.portfolio?
+ if project.portfolio? || project.program?
Project.none
else
Project
diff --git a/config/initializers/permissions.rb b/config/initializers/permissions.rb
index 54140b72cc9..abd50c324bd 100644
--- a/config/initializers/permissions.rb
+++ b/config/initializers/permissions.rb
@@ -43,6 +43,12 @@ Rails.application.reloader.to_prepare do
require: :loggedin,
visible: -> { OpenProject::FeatureDecisions.portfolio_models_active? }
+ map.permission :add_programs,
+ { projects: %i[new create] },
+ permissible_on: :global,
+ require: :loggedin,
+ visible: -> { OpenProject::FeatureDecisions.portfolio_models_active? }
+
map.permission :archive_project,
{
"projects/archive": %i[create]
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0521d10694b..5a76305b5af 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3244,6 +3244,8 @@ en:
label_project_hide_details: "Hide project details"
label_portfolio: "Portfolio"
label_portfolio_new: "New portfolio"
+ label_program: "Program"
+ label_program_new: "New program"
label_public_projects: "Public projects"
label_query_new: "New query"
label_query_plural: "Custom queries"
@@ -3754,6 +3756,7 @@ en:
permission_add_messages: "Post messages"
permission_add_project: "Create projects"
permission_add_portfolios: "Create portfolios"
+ permission_add_programs: "Create programs"
permission_add_work_package_attachments: "Add attachments"
permission_add_work_package_attachments_explanation: "Allows adding attachments without Edit work packages permission"
permission_add_internal_comments: "Write internal comments"
diff --git a/config/routes.rb b/config/routes.rb
index 0ecc97db40b..fb41405cc2f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -478,6 +478,11 @@ Rails.application.routes.draw do
defaults: { workspace_type: "portfolio" },
controller: "projects"
+ resources :programs,
+ only: %i[new],
+ defaults: { workspace_type: "program" },
+ controller: "projects"
+
resources :project_phases, only: [] do
member do
get "/hover_card" => "project_phases/hover_card#show", as: "hover_card"
diff --git a/lib/api/v3/projects/available_parents_api.rb b/lib/api/v3/projects/available_parents_api.rb
index 8d607c2462c..430528988f0 100644
--- a/lib/api/v3/projects/available_parents_api.rb
+++ b/lib/api/v3/projects/available_parents_api.rb
@@ -44,7 +44,7 @@ module API
project = if params[:of]
Project.find(params[:of])
else
- Project.new
+ Project.new(workspace_type: "project")
end
contract_class = if project.new_record?
diff --git a/spec/contracts/projects/create_contract_spec.rb b/spec/contracts/projects/create_contract_spec.rb
index bca29ff381e..099cd109810 100644
--- a/spec/contracts/projects/create_contract_spec.rb
+++ b/spec/contracts/projects/create_contract_spec.rb
@@ -45,7 +45,7 @@ RSpec.describe Projects::CreateContract do
templated: project_templated,
workspace_type: project_workspace_type)
end
- let(:global_permissions) { %i[add_project add_portfolios] }
+ let(:global_permissions) { %i[add_project add_portfolios add_programs] }
let(:validated_contract) do
contract.tap(&:validate)
end
@@ -78,6 +78,20 @@ RSpec.describe Projects::CreateContract do
it_behaves_like "contract is invalid", base: %i(error_unauthorized)
end
+ context "when having the 'program' workspace_type and having the add_programs permission" do
+ let(:project_workspace_type) { "program" }
+ let(:global_permissions) { [:add_programs] }
+
+ it_behaves_like "contract is valid"
+ end
+
+ context "when having the 'program' workspace_type and lacking the add_programs permission" do
+ let(:project_workspace_type) { "program" }
+ let(:global_permissions) { [:add_portfolios] }
+
+ it_behaves_like "contract is invalid", base: %i(error_unauthorized)
+ end
+
context "if workspace_type is nil" do
let(:project_workspace_type) { nil }
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index f6d0d6ce3bd..74fa9ac70c5 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -141,6 +141,14 @@ RSpec.describe ProjectsController do
it_behaves_like "successful request"
end
+
+ context "as a non-admin with global add_programs permission", with_flag: { portfolio_models: true } do
+ let(:parent) { nil }
+ let(:user) { create(:user, global_permissions: [:add_programs]) }
+ let(:template) { nil }
+
+ it_behaves_like "successful request"
+ end
end
describe "#create" do
@@ -215,6 +223,12 @@ RSpec.describe ProjectsController do
it_behaves_like "successful create request"
end
+
+ context "as a non-admin with global add_programs permission", with_flag: { portfolio_models: true } do
+ let(:user) { create(:user, global_permissions: [:add_programs]) }
+
+ it_behaves_like "successful create request"
+ end
end
context "without a template" do
diff --git a/spec/features/programs/create_spec.rb b/spec/features/programs/create_spec.rb
new file mode 100644
index 00000000000..115c0316db9
--- /dev/null
+++ b/spec/features/programs/create_spec.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+require "spec_helper"
+
+RSpec.describe "Programs",
+ "creation",
+ :js do
+ shared_let(:user_with_permissions) do
+ create(:user,
+ global_permissions: :add_programs)
+ end
+ # Role granted to creator on program creation to be able to access the program.
+ shared_let(:default_project_role) { create(:project_role) }
+
+ let(:projects_page) { Pages::Projects::Index.new }
+
+ current_user { user_with_permissions }
+
+ it "can create a program", with_flag: { portfolio_models: true } do
+ projects_page.visit!
+
+ projects_page.create_new_workspace
+
+ expect(page).to have_heading "New program"
+ # This should be an
+ # expect(page).to have_no_field "Subproject of"
+ # But this leads to a false negative. Even with the field being there, is the
+ # expectation passed.
+ expect(page).to have_no_content "Subproject of"
+
+ fill_in "Name", with: "Foo bar"
+ click_on "Create"
+
+ expect_and_dismiss_flash type: :success, message: "Successful creation."
+
+ expect(page).to have_current_path /\/projects\/foo-bar\/?/
+ expect(page).to have_content "Foo bar"
+ end
+
+ context "without the necessary permissions to create programs", with_flag: { portfolio_models: true } do
+ current_user { create(:user) }
+
+ it "cannot create the program" do
+ visit new_program_path
+
+ expect(page).to have_content "[Error 403] You are not authorized to access this page."
+ end
+ end
+
+ context "without the feature flag being active", with_flag: { portfolio_models: false } do
+ it "cannot create the program" do
+ visit new_program_path
+
+ expect(page).to have_content "[Error 403] You are not authorized to access this page."
+ end
+ end
+end
diff --git a/spec/models/projects/scopes/assignable_parents_spec.rb b/spec/models/projects/scopes/assignable_parents_spec.rb
index da9804bdc4c..80b46abcba3 100644
--- a/spec/models/projects/scopes/assignable_parents_spec.rb
+++ b/spec/models/projects/scopes/assignable_parents_spec.rb
@@ -59,4 +59,15 @@ RSpec.describe Projects::Scopes::AssignableParents do
.to be_empty
end
end
+
+ context "for a program" do
+ before do
+ subject_project.program!
+ end
+
+ it "is empty" do
+ expect(Project.assignable_parents(user, subject_project))
+ .to be_empty
+ end
+ end
end
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
index 7d8922ad6fe..1693345a4b6 100644
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
@@ -63,6 +63,12 @@ RSpec.describe ProjectsController do
controller: "projects", action: "new", workspace_type: "portfolio"
)
end
+
+ it do
+ expect(get("/programs/new")).to route_to(
+ controller: "projects", action: "new", workspace_type: "program"
+ )
+ end
end
describe "create" do