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] Simplify character validation
Tobias Dillmann6df38e9573e9
diff --git a/app/models/custom_field/calculated_value.rb b/app/models/custom_field/calculated_value.rbindex a4d0ad7bc9c..940a6238dce 100644--- a/app/models/custom_field/calculated_value.rb+++ b/app/models/custom_field/calculated_value.rb@@ -92,6 +92,7 @@ module CustomField::CalculatedValueif surplus_cfs.any?custom_field_names = CustomField.where(id: surplus_cfs).pluck(:name)+ # TODO: explain WHY the custom fields are not allowed:errors.add(:formula, :invalid_custom_fields, custom_fields: custom_field_names.join(", "))endend@@ -120,7 +121,7 @@ module CustomField::CalculatedValue# and ensures that the formula is really valid. A welcome side effect of the basic validation done here is that# it prevents built-in functions from being used in the formula, which we do not want to allow.allowed_chars = MATH_OPERATORS_FOR_FORMULA + [" "]- allowed_tokens = /\A(\{\{cf_\d+}}|\d+\.?\d*|\.\d+)\z/+ allowed_tokens = /\A(\{\{cf_\d+}}|[\d.]+)\z/formula_string.split(Regexp.union(allowed_chars)).reject(&:empty?).all? do |token|token.match?(allowed_tokens)