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
[#66471] Enable calculation of admin only calculated values on change of non admin only field values by non admins
Ivan Kuchin99dc6b8827eb
diff --git a/app/services/projects/concerns/set_calculated_custom_field_values.rb b/app/services/projects/concerns/set_calculated_custom_field_values.rbindex d65a77597aa..28a246a46d2 100644--- a/app/services/projects/concerns/set_calculated_custom_field_values.rb+++ b/app/services/projects/concerns/set_calculated_custom_field_values.rb@@ -50,7 +50,18 @@ module Projects::Concernsdef update_calculated_value_custom_fieldschanged_cf_ids = model.custom_values.select(&:changed?).map(&:custom_field_id)- affected_cfs = model.available_custom_fields.affected_calculated_fields(changed_cf_ids)++ # Using unscope(where: :admin_only) to fix an issue when non admin user+ # edits a custom field which is used by an admin only calculated value+ # field. Without this unscoping, admin only value and all fields+ # referencing it (recursively) will not be recalculated and there will+ # even be no place for that recalculatin to be triggered unless an admin+ # edits same value again.+ #+ # This may need to be handled differently to make it work for other custom+ # field containers, like WorkPackage. User custom fields also has+ # admin_only check.+ affected_cfs = model.available_custom_fields.unscope(where: :admin_only).affected_calculated_fields(changed_cf_ids)model.calculate_custom_fields(affected_cfs)enddiff --git a/spec/services/projects/set_attributes_service_spec.rb b/spec/services/projects/set_attributes_service_spec.rbindex e76487a19fb..1075889fbef 100644--- a/spec/services/projects/set_attributes_service_spec.rb+++ b/spec/services/projects/set_attributes_service_spec.rb@@ -554,14 +554,8 @@ RSpec.describe Projects::SetAttributesService, type: :model doexpect(subject.result.custom_value_attributes).to eq(cf_static.id => "3",cf_calculated1.id => "21",- cf_calculated3.id => "-6"- )-- expect(subject.result.custom_value_attributes(all: true)).to eq(- cf_static.id => "3",- cf_calculated1.id => "21",- cf_calculated2.id => "-6",- cf_calculated3.id => "-6"+ cf_calculated2.id => "231",+ cf_calculated3.id => "3003")endend