From 5de378f999643cfde8e41bcbc2c85cf0a0fc15e5 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 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 7036079..9d8f18c 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -239,6 +239,13 @@ module IssuesHelper r.to_html end + # wrapper around show_value that prevents unsaved defaults to be shown + def show_value_for_reading(value) + if value.customized.custom_values.where(custom_field_id: value.custom_field.id).any? + show_value value + end + end + 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? @@ -247,7 +254,7 @@ module IssuesHelper 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 + rows.send m, custom_field_name_tag(value.custom_field), show_value_for_reading(value), :class => css end end end @@ -258,7 +265,7 @@ module IssuesHelper s = ''.html_safe values.each_with_index do |value, i| - attr_value = show_value(value) + attr_value = show_value_for_reading(value) next if attr_value.blank? if value.custom_field.text_formatting == 'full' -- 2.1.4