jro_apps/redmine Commit - r10776:0ebf95d8199f

Merged r10992 from trunk (#12400)....

Jean-Philippe Lang -

r10776:0ebf95d8199f

parent child

Context file:

r10776:0ebf95d8199f

app/models/custom_field.rb +7 -1

                 possible_values_options = possible_values_options(customized)
                 if possible_values_options.present?
                   keyword = keyword.to_s.downcase
-                  possible_values_options.detect {|text, id| text.downcase == keyword}.try(:last)
+                  if v = possible_values_options.detect {|text, id| text.downcase == keyword}
+                    if v.is_a?(Array)
+                      v.last
+                    else
+                      v
+                    end
+                  end
                 else
                   keyword
                 end

test/fixtures/mail_handler/ticket_with_custom_fields.eml +1 0

             category: Stock management
             searchable field: Value for a custom field
+            Database:  postgresql

test/unit/custom_field_test.rb +5 0

                 assert_nil CustomField.new(:field_format => 'text').value_class
                 assert_nil CustomField.new.value_class
               end
+              def test_value_from_keyword_for_list_custom_field
+                field = CustomField.find(1)
+                assert_equal 'PostgreSQL', field.value_from_keyword('postgresql', Issue.find(1))
+              end
             end

test/unit/mail_handler_test.rb +2 -2

                 assert !issue.new_record?
                 issue.reload
                 assert_equal 'New ticket with custom field values', issue.subject
-                assert_equal 'Value for a custom field',
+                assert_equal 'PostgreSQL', issue.custom_field_value(1)
-                             issue.custom_value_for(CustomField.find_by_name('Searchable field')).value
+                assert_equal 'Value for a custom field', issue.custom_field_value(2)
                 assert !issue.description.match(/^searchable field:/i)
               end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages