mirror of
https://github.com/redmine/redmine.git
synced 2024-09-13 15:45:44 +02:00
Include value and label of possible values in custom fields API (#22745).
git-svn-id: http://svn.redmine.org/redmine/trunk@15401 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
b5bc96a90f
commit
60bb7565dd
@ -21,6 +21,7 @@ api.array :custom_fields do
|
||||
values.each do |label, value|
|
||||
api.possible_value do
|
||||
api.value value || label
|
||||
api.label label
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -32,10 +32,25 @@ class Redmine::ApiTest::CustomFieldsTest < Redmine::ApiTest::Base
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user