diff options
| -rw-r--r-- | lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb | 4 | ||||
| -rw-r--r-- | test/integration/api_test/custom_fields_attribute_test.rb | 46 |
2 files changed, 49 insertions, 1 deletions
diff --git a/lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb b/lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb index 3575cc550..b4863f731 100644 --- a/lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb +++ b/lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb @@ -72,10 +72,12 @@ module Redmine if values.has_key?(key) value = values[key] if value.is_a?(Array) - value = value.reject(&:blank?).uniq + value = value.reject(&:blank?).map(&:to_s).uniq if value.empty? value << '' end + else + value = value.to_s end custom_field_value.value = value end diff --git a/test/integration/api_test/custom_fields_attribute_test.rb b/test/integration/api_test/custom_fields_attribute_test.rb new file mode 100644 index 000000000..32837c9b7 --- /dev/null +++ b/test/integration/api_test/custom_fields_attribute_test.rb @@ -0,0 +1,46 @@ +# Redmine - project management software +# Copyright (C) 2006-2013 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +require File.expand_path('../../../test_helper', __FILE__) + +class Redmine::ApiTest::CustomFieldsAttributeTest < Redmine::ApiTest::Base + fixtures :users + + def setup + Setting.rest_api_enabled = '1' + end + + def test_integer_custom_fields_should_accept_strings + field = GroupCustomField.generate!(:field_format => 'int') + + post '/groups.json', %({"group":{"name":"Foo","custom_field_values":{"#{field.id}":"52"}}}), + {'CONTENT_TYPE' => 'application/json'}.merge(credentials('admin')) + assert_response :created + group = Group.order('id DESC').first + assert_equal "52", group.custom_field_value(field) + end + + def test_integer_custom_fields_should_accept_integers + field = GroupCustomField.generate!(:field_format => 'int') + + post '/groups.json', %({"group":{"name":"Foo","custom_field_values":{"#{field.id}":52}}}), + {'CONTENT_TYPE' => 'application/json'}.merge(credentials('admin')) + assert_response :created + group = Group.order('id DESC').first + assert_equal "52", group.custom_field_value(field) + end +end |