REST API: Integer custom field validation fails when using non-string values (#15929).

git-svn-id: http://svn.redmine.org/redmine/trunk@12704 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2014-01-25 12:08:22 +00:00
parent 20ff37ef42
commit 5faa1a4e6e
2 changed files with 49 additions and 1 deletions

View File

@ -72,10 +72,12 @@ module Redmine
if values.has_key?(key) if values.has_key?(key)
value = values[key] value = values[key]
if value.is_a?(Array) if value.is_a?(Array)
value = value.reject(&:blank?).uniq value = value.reject(&:blank?).map(&:to_s).uniq
if value.empty? if value.empty?
value << '' value << ''
end end
else
value = value.to_s
end end
custom_field_value.value = value custom_field_value.value = value
end end

View File

@ -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