31559.patch

Go MAEDA, 2019-06-29 11:15

Download (2.5 KB)

View differences:

app/views/enumerations/index.api.rsb
4 4
      api.id enumeration.id
5 5
      api.name enumeration.name
6 6
      api.is_default enumeration.is_default
7
      api.active enumeration.active
7 8
      render_api_custom_values enumeration.visible_custom_field_values, api
8 9
    end
9 10
  end
app/views/workflows/permissions.html.erb
16 16
  <label><%=l(:label_role)%>:
17 17
  <%= options_for_workflow_select 'role_id[]', Role.sorted.select(&:consider_workflow?), @roles, :id => 'role_id', :class => 'expandable' %>
18 18
  </label>
19
  <a href="#" data-expands="#role_id"><span class="toggle-multiselect icon-only icon-toggle-plus"></a>
19
  <a href="#" data-expands="#role_id"><span class="toggle-multiselect icon-only icon-toggle-plus"></span></a>
20 20

  
21 21
  <label><%=l(:label_tracker)%>:
22 22
  <%= options_for_workflow_select 'tracker_id[]', Tracker.sorted, @trackers, :id => 'tracker_id', :class => 'expandable' %>
23 23
  </label>
24
  <a href="#" data-expands="#tracker_id"><span class="toggle-multiselect icon-only icon-toggle-plus"></a>
24
  <a href="#" data-expands="#tracker_id"><span class="toggle-multiselect icon-only icon-toggle-plus"></span></a>
25 25

  
26 26
  <%= submit_tag l(:button_edit), :name => nil %>
27 27

  
test/integration/api_test/enumerations_test.rb
27 27
    assert_response :success
28 28
    assert_equal 'application/xml', response.content_type
29 29
    assert_select 'issue_priorities[type=array]' do
30
      assert_select 'issue_priority' do
30
      assert_select 'issue_priority:nth-of-type(3)' do
31 31
        assert_select 'id', :text => '6'
32 32
        assert_select 'name', :text => 'High'
33
        assert_select 'active', :text => 'true'
34
      end
35
      assert_select 'issue_priority:nth-of-type(6)' do
36
        assert_select 'id', :text => '15'
37
        assert_select 'name', :text => 'Inactive Priority'
38
        assert_select 'active', :text => 'false'
33 39
      end
34 40
    end
35 41
  end