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

use non nested default parameter to be in line with other params

ulferts272a85d250c9
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 6199906f51c..3664278b822 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.dig(:project, :workspace_type) == Project.workspace_types[:portfolio]
+ params[:workspace_type] == Project.workspace_types[:portfolio]
}
before_action :find_optional_template, only: %i[new create]
before_action :find_optional_parent, only: :new
@@ -189,7 +189,7 @@ class ProjectsController < ApplicationController
def from_template? = @template.present?
def new_blank
- @new_project = @parent&.children&.build(permitted_params.new_project) || Project.new(permitted_params.new_project)
+ @new_project = @parent&.children&.build(params.permit(:workspace_type)) || Project.new(params.permit(:workspace_type))
render layout: "no_menu"
end
@@ -275,8 +275,8 @@ class ProjectsController < ApplicationController
::Exports::Register.list_formats(Project).map(&:to_s)
end
- def not_authorized_on_feature_flag_inactive(flag)
- render_403 unless OpenProject::FeatureDecisions.active.include?(flag)
+ def not_authorized_on_feature_flag_inactive
+ render_403 unless OpenProject::FeatureDecisions.portfolio_models_active?
end
helper_method :supported_export_formats
diff --git a/config/routes.rb b/config/routes.rb
index 4222ef1f59a..0ecc97db40b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -265,7 +265,7 @@ Rails.application.routes.draw do
# default parameters can be defined.
resources :projects,
only: %i[new],
- defaults: { project: { workspace_type: "project" } }
+ defaults: { workspace_type: "project" }
resources :projects, except: %i[new show edit update] do
scope module: "projects" do
@@ -475,7 +475,7 @@ Rails.application.routes.draw do
resources :portfolios,
only: %i[new],
- defaults: { project: { workspace_type: "portfolio" } },
+ defaults: { workspace_type: "portfolio" },
controller: "projects"
resources :project_phases, only: [] do
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
index 51764d8dfee..b243006856f 100644
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
@@ -54,7 +54,7 @@ RSpec.describe ProjectsController do
describe "new" do
it do
expect(get("/projects/new")).to route_to(
- controller: "projects", action: "new"
+ controller: "projects", action: "new", workspace_type: "project"
)
end
end