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

[#66093] WIP

Tobias Dillmann770c5236cf58
diff --git a/app/models/custom_value.rb b/app/models/custom_value.rb
index 5b696e0c2bd..4eb5e941d23 100644
--- a/app/models/custom_value.rb
+++ b/app/models/custom_value.rb
@@ -31,7 +31,8 @@
class CustomValue < ApplicationRecord
belongs_to :custom_field
belongs_to :customized, polymorphic: true
- has_many :custom_value_errors, dependent: :destroy
+
+ has_many :custom_value_errors, dependent: :delete_all
validate :validate_presence_of_required_value
validate :validate_format_of_value
diff --git a/app/models/custom_value_error.rb b/app/models/custom_value_error.rb
index 84763b8e444..2e58c1a96e0 100644
--- a/app/models/custom_value_error.rb
+++ b/app/models/custom_value_error.rb
@@ -36,4 +36,8 @@ class CustomValueError < ApplicationRecord
].freeze
validates :error_code, inclusion: { in: VALID_ERROR_CODES }
+
+ def error_message
+ "TODO: humanize error code into a nice, translated error message"
+ end
end
diff --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.erb
index 382842ee8f0..7838fc50492 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
@@ -8,7 +8,7 @@
}
) do |custom_field_value_container|
# temporarily using inline styles in order to align the content as desired
- custom_field_value_container.with_row(mb: 1) do |attribute_name|
+ custom_field_value_container.with_row(mb: 1) do
render OpenProject::Common::AttributeLabelComponent.new(
attribute: @project_custom_field.attribute_name,
model: @project
@@ -24,5 +24,11 @@
render_value
end
end
+
+ if custom_field_value_has_error?
+ custom_field_value_container.with_row(w: :full) do
+ render_error
+ end
+ end
end
%>
diff --git a/modules/overviews/app/components/overviews/project_custom_fields/item_component.rb b/modules/overviews/app/components/overviews/project_custom_fields/item_component.rb
index c91f41e5ed6..351c4bb1495 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,6 +49,21 @@ 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
+ end
+
+ def render_error
+ render(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(" ")
+ end
+ end
+
def render_value
case @project_custom_field.field_format
when "link"