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
[#66093] CalculatedValueError belongs to Project and CustomField
Tobias Dillmannf7b5770af24b
diff --git a/app/models/acts_as_customizable/calculated_value.rb b/app/models/acts_as_customizable/calculated_value.rbindex 8a719da2bd8..39b60eb7bff 100644--- a/app/models/acts_as_customizable/calculated_value.rb+++ b/app/models/acts_as_customizable/calculated_value.rb@@ -55,6 +55,14 @@ module ActsAsCustomizable::CalculatedValue)self.custom_field_values = custom_fields.to_h { [it.id, result[it.column_name]] }++ result.each do |cf_id, calculation_result|+ if calculation_result.nil? && is_a?(Project)+ CalculatedValueError.create!(project: self,+ custom_field_id: cf_id.sub("cf_", "").to_i,+ error_code: "ERROR_MATHEMATICAL")+ end+ endendprivate@@ -63,7 +71,7 @@ module ActsAsCustomizable::CalculatedValuecalculator = CustomField::CalculatedValue.calculator_instancecalculator.store(given)- calculator.solve(to_compute).reject { |_, value| value == :undefined }+ calculator.solve(to_compute).transform_values { |value| value == :undefined ? nil : value }enddef calculated_value_fields_given(custom_fields:, enabled_ids:)diff --git a/app/models/custom_value_error.rb b/app/models/calculated_value_error.rbsimilarity index 88%rename from app/models/custom_value_error.rbrename to app/models/calculated_value_error.rbindex 2e58c1a96e0..56ad78af475 100644--- a/app/models/custom_value_error.rb+++ b/app/models/calculated_value_error.rb@@ -28,13 +28,17 @@# See COPYRIGHT and LICENSE files for more details.#++-class CustomValueError < ApplicationRecord- belongs_to :custom_value+class CalculatedValueError < ApplicationRecord+ belongs_to :project+ belongs_to :custom_fieldVALID_ERROR_CODES = %w[ERROR_MATHEMATICAL].freeze+ validates :project_id, presence: true+ validates :custom_field_id, presence: true+validates :error_code, inclusion: { in: VALID_ERROR_CODES }def error_messagediff --git a/app/models/custom_field.rb b/app/models/custom_field.rbindex bf62ae8c013..6375a94152c 100644--- a/app/models/custom_field.rb+++ b/app/models/custom_field.rb@@ -51,6 +51,8 @@ class CustomField < ApplicationRecordattr_readonly :field_format+ has_many :calculated_value_errors, dependent: :delete_all, inverse_of: "custom_field"+scope :hierarchy_root_and_children, -> { includes(hierarchy_root: { children: :children }) }scope :required, -> { where(is_required: true) }diff --git a/app/models/custom_value.rb b/app/models/custom_value.rbindex 4eb5e941d23..4e9c5d55dfe 100644--- a/app/models/custom_value.rb+++ b/app/models/custom_value.rb@@ -32,8 +32,6 @@ class CustomValue < ApplicationRecordbelongs_to :custom_fieldbelongs_to :customized, polymorphic: true- has_many :custom_value_errors, dependent: :delete_all-validate :validate_presence_of_required_valuevalidate :validate_format_of_valuevalidate :validate_type_of_valuediff --git a/app/models/project.rb b/app/models/project.rbindex 1d7733dc638..c995f029077 100644--- a/app/models/project.rb+++ b/app/models/project.rb@@ -68,6 +68,7 @@ class Project < ApplicationRecordclass_name: "Member"has_many :users, through: :members, source: :principalhas_many :principals, through: :member_principals, source: :principal+ has_many :calculated_value_errors, dependent: :delete_all, inverse_of: :projecthas_many :enabled_modules, dependent: :delete_allhas_and_belongs_to_many :types, -> {diff --git a/db/migrate/20250908072653_create_custom_value_errors.rb b/db/migrate/20250908072653_create_calculated_value_errors.rbsimilarity index 86%rename from db/migrate/20250908072653_create_custom_value_errors.rbrename to db/migrate/20250908072653_create_calculated_value_errors.rbindex 8526fb120c8..81b20191910 100644--- a/db/migrate/20250908072653_create_custom_value_errors.rb+++ b/db/migrate/20250908072653_create_calculated_value_errors.rb@@ -28,10 +28,11 @@# See COPYRIGHT and LICENSE files for more details.#++-class CreateCustomValueErrors < ActiveRecord::Migration[8.0]+class CreateCalculatedValueErrors < ActiveRecord::Migration[8.0]def change- create_table :custom_value_errors do |t|- t.references :custom_value, foreign_key: true+ create_table :calculated_value_errors do |t|+ t.references :project, foreign_key: true+ t.references :custom_field, foreign_key: truet.string :error_code, null: falset.timestampsdiff --git a/lib_static/plugins/acts_as_customizable/lib/acts_as_customizable.rb b/lib_static/plugins/acts_as_customizable/lib/acts_as_customizable.rbindex a360d297b38..05bbb564567 100644--- a/lib_static/plugins/acts_as_customizable/lib/acts_as_customizable.rb+++ b/lib_static/plugins/acts_as_customizable/lib/acts_as_customizable.rb@@ -200,11 +200,6 @@ module Redminedef ensure_custom_values_completereturn unless custom_values.loaded? && (custom_values.any?(&:changed?) || custom_value_destroyed)- custom_values.select(&:marked_for_destruction?).each do |custom_value|- # Avoid foreign key constraint violations- custom_value.custom_value_errors.delete_all- end-self.custom_values = custom_field_values(all: true)enddiff --git a/modules/overviews/app/components/overviews/project_custom_fields/item_component.html.erb b/modules/overviews/app/components/overviews/project_custom_fields/item_component.html.erbindex 7838fc50492..e3b102153d0 100644--- a/modules/overviews/app/components/overviews/project_custom_fields/item_component.html.erb+++ b/modules/overviews/app/components/overviews/project_custom_fields/item_component.html.erb@@ -25,9 +25,9 @@endend- if custom_field_value_has_error?+ if calculation_error?custom_field_value_container.with_row(w: :full) do- render_error+ render_calculation_errorendendenddiff --git a/modules/overviews/app/components/overviews/project_custom_fields/item_component.rb b/modules/overviews/app/components/overviews/project_custom_fields/item_component.rbindex 351c4bb1495..a5a404aa06f 100644--- a/modules/overviews/app/components/overviews/project_custom_fields/item_component.rb+++ b/modules/overviews/app/components/overviews/project_custom_fields/item_component.rb@@ -49,18 +49,14 @@ module Overviews@project_custom_field_values.empty? || @project_custom_field_values.all? { |cf_value| cf_value.value.blank? }end- def custom_field_value_has_error?- @project_custom_field_values.any? do |cf_value|- puts "FOO custom value errors: #{cf_value.custom_value_errors.inspect}"- cf_value.custom_value_errors.any?- end+ def calculation_error?+ @project_custom_field.field_format_calculated_value? &&+ @project_custom_field.calculated_value_errors.where(project: @project).any?end- def render_error+ def render_calculation_errorrender(Primer::Beta::Text.new(color: :danger)) do- @project_custom_field_values&.flat_map do |cf_value|- cf_value.custom_value_errors.map(&:error_message).join(" ")- end&.join(" ")+ @project_custom_field.calculated_value_errors.where(project: @project).map(&:error_message).join(" ")endend