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
[#64348] Fail validation if unknown custom field is in formula
Tobias Dillmann9e742beba166
diff --git a/app/models/custom_field/calculated_value.rb b/app/models/custom_field/calculated_value.rbindex 16c8b5fbb52..229f6074e73 100644--- a/app/models/custom_field/calculated_value.rb+++ b/app/models/custom_field/calculated_value.rb@@ -40,11 +40,10 @@ module CustomField::CalculatedValueFIELD_FORMATS_FOR_FORMULA = %w[int float calculated_value].freezeincluded do- validate :validate_formula+ validate :validate_formula, if: :field_format_calculated_value?+ validate :validate_referenced_custom_fields_allowed, if: :field_format_calculated_value?def validate_formula- return unless field_format_calculated_value?-if formula_string.blank?errors.add(:formula, :blank)return@@ -60,11 +59,7 @@ module CustomField::CalculatedValuereturnend- # WP-64348: check for valid (i.e., visible & enabled) custom field references (see #cf_ids_used_in_formula)-- # TODO: consider differentiating between a formula that contains missing variables, invalid- # syntax, or mathematical errors.- true # return anything to appease RuboCop for now+ trueenddef formula=(value)@@ -90,6 +85,21 @@ module CustomField::CalculatedValue.visibleend+ def validate_referenced_custom_fields_allowed+ formula_cfs = CustomField.where(id: cf_ids_used_in_formula(formula_string)).pluck(:id)+ allowed_cfs = usable_custom_field_references_for_formula.pluck(:id)++ surplus_cfs = formula_cfs - allowed_cfs++ if surplus_cfs.any?+ errors.add(:formula, :invalid_custom_fields, surplus_cfs:)+ return+ end++ # TODO: validate referenced custom fields are enabled. This can only be done in the context of a project.+ true+ end+privatedef calculator