Fixed that custom field referencing deleted value trigger an error on display (#16926).

git-svn-id: http://svn.redmine.org/redmine/trunk@13141 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/field_format.rb b/lib/redmine/field_format.rb
index 3b567a0b8190495888bb275ce7e1638499d34d94..655e2c98499ae6ab35c82ec6b79db917a064a3d8 100644 (file)
--- a/lib/redmine/field_format.rb
+++ b/lib/redmine/field_format.rb
@@ -98,9 +98,10 @@ module Redmine
         if value.blank?
           nil
         elsif value.is_a?(Array)
-          value.map do |v|
+          casted = value.map do |v|
             cast_single_value(custom_field, v, customized)
-          end.sort
+          end
+          casted.compact.sort
         else
           cast_single_value(custom_field, value, customized)
         end

diff --git a/test/unit/lib/redmine/field_format/version_field_format_test.rb b/test/unit/lib/redmine/field_format/version_field_format_test.rb
index 50e0e378645048c1c4b39e52c6fb362879fd2b0e..f7fc72a03f7bdf479c068ecb9483ccd46d918144 100644 (file)
--- a/test/unit/lib/redmine/field_format/version_field_format_test.rb
+++ b/test/unit/lib/redmine/field_format/version_field_format_test.rb
@@ -56,4 +56,11 @@ class Redmine::VersionFieldFormatTest < ActionView::TestCase
 
     assert_equal expected, field.possible_values_options(project).map(&:first)
   end
+
+  def test_cast_value_should_not_raise_error_when_array_contains_value_casted_to_nil
+    field = IssueCustomField.new(:field_format => 'version')
+    assert_nothing_raised do
+      field.cast_value([1,2, 42])
+    end
+  end
 end