Commit 3a2c0e8c authored by jplang's avatar jplang

Custom field (long text format) displayed even if empty (#19482).

git-svn-id: https://svn.redmine.org/redmine/trunk@14215 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent dd012825
......@@ -300,10 +300,14 @@ module Redmine
def formatted_value(view, custom_field, value, customized=nil, html=false)
if html
if custom_field.text_formatting == 'full'
view.textilizable(value, :object => customized)
if value.present?
if custom_field.text_formatting == 'full'
view.textilizable(value, :object => customized)
else
view.simple_format(html_escape(value))
end
else
view.simple_format(html_escape(value))
''
end
else
value.to_s
......
......@@ -363,6 +363,15 @@ class ProjectsControllerTest < ActionController::TestCase
assert_select 'li', :text => /#{f2.name}/
end
def test_show_should_not_display_blank_text_custom_fields
f1 = ProjectCustomField.generate! :field_format => 'text'
get :show, :id => 1
assert_response :success
assert_select 'li', :text => /#{f1.name}/, :count => 0
end
def test_show_should_not_fail_when_custom_values_are_nil
project = Project.find_by_identifier('ecookbook')
project.custom_values.first.update_attribute(:value, nil)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment