Merged r13109 (#16739).

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13160 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/custom_fields/index.api.rsb b/app/views/custom_fields/index.api.rsb
index 902edff164055dec698f4f6b6a099f3d05b6c65f..77c9cf3b36a32f88723fda8431c33ae978e0eede 100644 (file)
--- a/app/views/custom_fields/index.api.rsb
+++ b/app/views/custom_fields/index.api.rsb
@@ -27,12 +27,12 @@ api.array :custom_fields do
       end
 
       if field.is_a?(IssueCustomField)
-        api.trackers do
+        api.array :trackers do
           field.trackers.each do |tracker|
             api.tracker :id => tracker.id, :name => tracker.name
           end
         end
-        api.roles do
+        api.array :roles do
           field.roles.each do |role|
             api.role :id => role.id, :name => role.name
           end

diff --git a/test/integration/api_test/custom_fields_test.rb b/test/integration/api_test/custom_fields_test.rb
index 3b5bbdd351dc7f3a69d60bc52b48cb7c870d4291..4ef6fc70762ba1d7296e897e025ccbc1b39e5323 100644 (file)
--- a/test/integration/api_test/custom_fields_test.rb
+++ b/test/integration/api_test/custom_fields_test.rb
@@ -37,6 +37,8 @@ class Redmine::ApiTest::CustomFieldsTest < Redmine::ApiTest::Base
         assert_select 'possible_values[type=array]' do
           assert_select 'possible_value>value', :text => 'PostgreSQL'
         end
+        assert_select 'trackers[type=array]'
+        assert_select 'roles[type=array]'
       end
     end
   end