From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 28 May 2016 11:37:28 +0000 (+0000)
Subject: NoMethodError: undefined method `id' error on EnumerationFormat#value_from_keyword... 
X-Git-Tag: 3.4.0~955
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fad71f8b4bd8f1079c3fe355dc2dafeb2b5ca9ee;p=redmine.git

NoMethodError: undefined method `id' error on EnumerationFormat#value_from_keyword (#22911).

Patch by Haihan Ji.

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

diff --git a/lib/redmine/field_format.rb b/lib/redmine/field_format.rb
index c7e8115a6..dd94eeefd 100644
--- a/lib/redmine/field_format.rb
+++ b/lib/redmine/field_format.rb
@@ -715,7 +715,7 @@ module Redmine
       end
 
       def value_from_keyword(custom_field, keyword, object)
-        value = custom_field.enumerations.where("LOWER(name) LIKE LOWER(?)", keyword)
+        value = custom_field.enumerations.where("LOWER(name) LIKE LOWER(?)", keyword).first
         value ? value.id : nil
       end
     end
diff --git a/test/unit/lib/redmine/field_format/enumeration_format_test.rb b/test/unit/lib/redmine/field_format/enumeration_format_test.rb
index a78bdf137..467c1ed9d 100644
--- a/test/unit/lib/redmine/field_format/enumeration_format_test.rb
+++ b/test/unit/lib/redmine/field_format/enumeration_format_test.rb
@@ -84,4 +84,8 @@ class Redmine::EnumerationFieldFormatTest < ActionView::TestCase
       end
     end
   end
+
+  def test_value_from_keyword_should_return_enumeration_id
+    assert_equal @foo.id, @field.value_from_keyword('foo', nil)
+  end
 end