jro_apps/redmine Commit - r15019:60bb7565dd84

Include value and label of possible values in custom fields API (#22745)....

Jean-Philippe Lang -

r15019:60bb7565dd84

parent child

Context file:

r15019:60bb7565dd84

Collapse all files

app/views/custom_fields/index.api.rsb +1 0

             api.array :custom_fields do
               @custom_fields.each do |field|
                 api.custom_field do
                   api.id                field.id
                   api.name              field.name
                   api.customized_type   field.class.customized_class.name.underscore if field.class.customized_class
                   api.field_format      field.field_format
                   api.regexp            field.regexp
                   api.min_length        field.min_length
                   api.max_length        field.max_length
                   api.is_required       field.is_required?
                   api.is_filter         field.is_filter?
                   api.searchable        field.searchable
                   api.multiple          field.multiple?
                   api.default_value     field.default_value
                   api.visible           field.visible?
                   values = field.possible_values_options
                   if values.present?
                     api.array :possible_values do
                       values.each do |label, value|
                         api.possible_value do
                           api.value value || label
+                          api.label label
                         end
                       end
                     end
                   end
                   if field.is_a?(IssueCustomField)
                     api.array :trackers do
                       field.trackers.each do |tracker|
                         api.tracker :id => tracker.id, :name => tracker.name
                       end
                     end
                     api.array :roles do
                       field.roles.each do |role|
                         api.role :id => role.id, :name => role.name
                       end
                     end
                   end
                 end
               end
             end

test/integration/api_test/custom_fields_test.rb +15 0

             # Redmine - project management software
             # Copyright (C) 2006-2016  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::CustomFieldsTest < Redmine::ApiTest::Base
               fixtures :users, :custom_fields
               test "GET /custom_fields.xml should return custom fields" do
                 get '/custom_fields.xml', {}, credentials('admin')
                 assert_response :success
                 assert_equal 'application/xml', response.content_type
                 assert_select 'custom_fields' do
                   assert_select 'custom_field' do
                     assert_select 'name', :text => 'Database'
                     assert_select 'id', :text => '2'
                     assert_select 'customized_type', :text => 'issue'
                     assert_select 'possible_values[type=array]' do
                       assert_select 'possible_value>value', :text => 'PostgreSQL'
+                      assert_select 'possible_value>label', :text => 'PostgreSQL'
                     end
                     assert_select 'trackers[type=array]'
                     assert_select 'roles[type=array]'
                   end
                 end
               end
+              test "GET /custom_fields.xml should include value and label for enumeration custom fields" do
+                field = IssueCustomField.generate!(:field_format => 'enumeration')
+                foo = field.enumerations.create!(:name => 'Foo')
+                bar = field.enumerations.create!(:name => 'Bar')
+                get '/custom_fields.xml', {}, credentials('admin')
+                assert_response :success
+                assert_select 'possible_value' do
+                  assert_select "value:contains(?) + label:contains(?)", foo.id.to_s, 'Foo'
+                  assert_select "value:contains(?) + label:contains(?)", bar.id.to_s, 'Bar'
+                end
+              end
             end

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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