@@ -160,7 +160,13 class CustomField < ActiveRecord::Base | |||
|
160 | 160 | possible_values_options = possible_values_options(customized) |
|
161 | 161 | if possible_values_options.present? |
|
162 | 162 | keyword = keyword.to_s.downcase |
|
163 |
possible_values_options.detect {|text, id| text.downcase == keyword} |
|
|
163 | if v = possible_values_options.detect {|text, id| text.downcase == keyword} | |
|
164 | if v.is_a?(Array) | |
|
165 | v.last | |
|
166 | else | |
|
167 | v | |
|
168 | end | |
|
169 | end | |
|
164 | 170 | else |
|
165 | 171 | keyword |
|
166 | 172 | end |
@@ -39,3 +39,4 pulvinar dui, a gravida orci mi eget odio. Nunc a lacus. | |||
|
39 | 39 | |
|
40 | 40 | category: Stock management |
|
41 | 41 | searchable field: Value for a custom field |
|
42 | Database: postgresql |
@@ -218,4 +218,9 class CustomFieldTest < ActiveSupport::TestCase | |||
|
218 | 218 | assert_nil CustomField.new(:field_format => 'text').value_class |
|
219 | 219 | assert_nil CustomField.new.value_class |
|
220 | 220 | end |
|
221 | ||
|
222 | def test_value_from_keyword_for_list_custom_field | |
|
223 | field = CustomField.find(1) | |
|
224 | assert_equal 'PostgreSQL', field.value_from_keyword('postgresql', Issue.find(1)) | |
|
225 | end | |
|
221 | 226 | end |
@@ -177,8 +177,8 class MailHandlerTest < ActiveSupport::TestCase | |||
|
177 | 177 | assert !issue.new_record? |
|
178 | 178 | issue.reload |
|
179 | 179 | assert_equal 'New ticket with custom field values', issue.subject |
|
180 |
assert_equal ' |
|
|
181 | issue.custom_value_for(CustomField.find_by_name('Searchable field')).value | |
|
180 | assert_equal 'PostgreSQL', issue.custom_field_value(1) | |
|
181 | assert_equal 'Value for a custom field', issue.custom_field_value(2) | |
|
182 | 182 | assert !issue.description.match(/^searchable field:/i) |
|
183 | 183 | end |
|
184 | 184 |
General Comments 0
You need to be logged in to leave comments.
Login now