| @@ -130,7 +130,13 class CustomField < ActiveRecord::Base | |||
|
|
130 | 130 | possible_values_options = possible_values_options(customized) |
|
|
131 | 131 | if possible_values_options.present? |
|
|
132 | 132 | keyword = keyword.to_s.downcase |
|
|
133 |
possible_values_options.detect {|text, id| text.downcase == keyword} |
|
|
|
133 | if v = possible_values_options.detect {|text, id| text.downcase == keyword} | |
|
|
134 | if v.is_a?(Array) | |
|
|
135 | v.last | |
|
|
136 | else | |
|
|
137 | v | |
|
|
138 | end | |
|
|
139 | end | |
|
|
134 | 140 | else |
|
|
135 | 141 | keyword |
|
|
136 | 142 | 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 | |
| @@ -212,4 +212,9 class CustomFieldTest < ActiveSupport::TestCase | |||
|
|
212 | 212 | assert_nil CustomField.new(:field_format => 'text').value_class |
|
|
213 | 213 | assert_nil CustomField.new.value_class |
|
|
214 | 214 | end |
|
|
215 | ||
|
|
216 | def test_value_from_keyword_for_list_custom_field | |
|
|
217 | field = CustomField.find(1) | |
|
|
218 | assert_equal 'PostgreSQL', field.value_from_keyword('postgresql', Issue.find(1)) | |
|
|
219 | end | |
|
|
215 | 220 | 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