diff --git a/app/views/enumerations/index.api.rsb b/app/views/enumerations/index.api.rsb index 2cd219ff3..796e63aa0 100644 --- a/app/views/enumerations/index.api.rsb +++ b/app/views/enumerations/index.api.rsb @@ -4,6 +4,7 @@ api.array @klass.name.underscore.pluralize do api.id enumeration.id api.name enumeration.name api.is_default enumeration.is_default + api.active enumeration.active render_api_custom_values enumeration.visible_custom_field_values, api end end diff --git a/app/views/workflows/permissions.html.erb b/app/views/workflows/permissions.html.erb index 60ad1c73c..f2e9fff7b 100644 --- a/app/views/workflows/permissions.html.erb +++ b/app/views/workflows/permissions.html.erb @@ -16,12 +16,12 @@ - + - + <%= submit_tag l(:button_edit), :name => nil %> diff --git a/test/integration/api_test/enumerations_test.rb b/test/integration/api_test/enumerations_test.rb index 149a487ba..05e0e9f7c 100644 --- a/test/integration/api_test/enumerations_test.rb +++ b/test/integration/api_test/enumerations_test.rb @@ -27,9 +27,15 @@ class Redmine::ApiTest::EnumerationsTest < Redmine::ApiTest::Base assert_response :success assert_equal 'application/xml', response.content_type assert_select 'issue_priorities[type=array]' do - assert_select 'issue_priority' do + assert_select 'issue_priority:nth-of-type(3)' do assert_select 'id', :text => '6' assert_select 'name', :text => 'High' + assert_select 'active', :text => 'true' + end + assert_select 'issue_priority:nth-of-type(6)' do + assert_select 'id', :text => '15' + assert_select 'name', :text => 'Inactive Priority' + assert_select 'active', :text => 'false' end end end