Browse Source

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

git-svn-id: http://svn.redmine.org/redmine/trunk@14215 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.1.0
Jean-Philippe Lang 9 years ago
parent
commit
16b5ff6aaf
2 changed files with 16 additions and 3 deletions
  1. 7
    3
      lib/redmine/field_format.rb
  2. 9
    0
      test/functional/projects_controller_test.rb

+ 7
- 3
lib/redmine/field_format.rb View File

@@ -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

+ 9
- 0
test/functional/projects_controller_test.rb View File

@@ -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)

Loading…
Cancel
Save