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

Fix costlog controller

Klaus Zandersabf6f2dffb58
diff --git a/modules/costs/app/controllers/costlog_controller.rb b/modules/costs/app/controllers/costlog_controller.rb
index 4a49d145d8b..e81b8a6b912 100644
--- a/modules/costs/app/controllers/costlog_controller.rb
+++ b/modules/costs/app/controllers/costlog_controller.rb
@@ -120,11 +120,12 @@ class CostlogController < ApplicationController
User.find_by(id: user_id)
end
- work_package_id = cost_entry_params.delete(:work_package_id)
- @work_package = if @cost_entry.present? && @cost_entry.entity_type == "WorkPackage" && @cost_entry.enity_id == work_package_id
+ entity_id = cost_entry_params.delete(:entity_id)
+ entity_type = cost_entry_params.delete(:entity_type)
+ @work_package = if @cost_entry.present? && @cost_entry.entity_type == "WorkPackage" && @cost_entry.entity_id == entity_id
@cost_entry.entity
- else
- WorkPackage.find_by(id: work_package_id)
+ elsif entity_type == "WorkPackage"
+ WorkPackage.find_by(id: entity_id)
end
cost_type_id = cost_entry_params.delete(:cost_type_id)
@@ -161,7 +162,14 @@ class CostlogController < ApplicationController
end
def cost_entry_params
- params.require(:cost_entry).permit(:work_package_id, :spent_on, :user_id,
- :cost_type_id, :units, :comments)
+ params
+ .require(:cost_entry)
+ .permit(:entity_id, :entity_type, :spent_on, :user_id,
+ :cost_type_id, :units, :comments).tap do |permitted_params|
+ if params[:cost_entry][:work_package_id]
+ permitted_params[:entity_id] = params[:cost_entry][:work_package_id]
+ permitted_params[:entity_type] = "WorkPackage"
+ end
+ end
end
end
diff --git a/modules/costs/spec/controllers/costlog_controller_spec.rb b/modules/costs/spec/controllers/costlog_controller_spec.rb
index 8574cd8d92a..02f90352cd2 100644
--- a/modules/costs/spec/controllers/costlog_controller_spec.rb
+++ b/modules/costs/spec/controllers/costlog_controller_spec.rb
@@ -41,9 +41,9 @@ RSpec.describe CostlogController do
let (:controller) { build(:project_role, permissions: %i[log_costs edit_cost_entries]) }
let (:cost_type) { build(:cost_type) }
let (:cost_entry) do
- build(:cost_entry, work_package:,
+ build(:cost_entry, entity: work_package,
project:,
- spent_on: Date.today,
+ spent_on: Date.current,
overridden_costs: 400,
units: 100,
user:,
@@ -68,7 +68,7 @@ RSpec.describe CostlogController do
shared_examples_for "assigns" do
it do
expect(assigns(:cost_entry).project).to eq(expected_project)
- expect(assigns(:cost_entry).work_package).to eq(expected_work_package)
+ expect(assigns(:cost_entry).entity).to eq(expected_work_package)
expect(assigns(:cost_entry).user).to eq(expected_user)
expect(assigns(:cost_entry).spent_on).to eq(expected_spent_on)
expect(assigns(:cost_entry).cost_type).to eq(expected_cost_type)
@@ -92,7 +92,7 @@ RSpec.describe CostlogController do
let(:expected_project) { project }
let(:expected_work_package) { work_package }
let(:expected_user) { user }
- let(:expected_spent_on) { Date.today }
+ let(:expected_spent_on) { Date.current }
let(:expected_cost_type) { nil }
let(:expected_overridden_costs) { nil }
let(:expected_units) { nil }