From f1c03941b58901e34afa9013541ce61f9c1c104c Mon Sep 17 00:00:00 2001 From: Jens Kraemer Date: Wed, 26 Apr 2017 01:16:17 +0800 Subject: [PATCH] do not display default values that aren't actually set --- app/helpers/issues_helper.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 7036079..0fbd7c9 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -242,12 +242,17 @@ module IssuesHelper def render_half_width_custom_fields_rows(issue) values = issue.visible_custom_field_values.reject {|value| value.custom_field.full_width_layout?} return if values.empty? + + existing_custom_field_ids = issue.custom_values.pluck(:custom_field_id) half = (values.size / 2.0).ceil issue_fields_rows do |rows| values.each_with_index do |value, i| css = "cf_#{value.custom_field.id}" m = (i < half ? :left : :right) - rows.send m, custom_field_name_tag(value.custom_field), show_value(value), :class => css + if existing_custom_field_ids.include?(value.custom_field.id) + content = show_value(value) + end + rows.send m, custom_field_name_tag(value.custom_field), content, :class => css end end end @@ -256,9 +261,12 @@ module IssuesHelper values = issue.visible_custom_field_values.select {|value| value.custom_field.full_width_layout?} return if values.empty? + existing_custom_field_ids = issue.custom_values.pluck(:custom_field_id) s = ''.html_safe values.each_with_index do |value, i| - attr_value = show_value(value) + if existing_custom_field_ids.include?(value.custom_field.id) + attr_value = show_value(value) + end next if attr_value.blank? if value.custom_field.text_formatting == 'full' -- 2.1.4