diff --git a/app/views/workflows/permissions.html.erb b/app/views/workflows/permissions.html.erb index 0374021..032aa9d 100644 --- a/app/views/workflows/permissions.html.erb +++ b/app/views/workflows/permissions.html.erb @@ -85,7 +85,7 @@ <%= field.name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %> <% for status in @statuses -%> - + <%= field_permission_tag(@permissions, status, field, @roles) %> <% unless status == @statuses.last %>»<% end %> diff --git a/test/functional/workflows_controller_test.rb b/test/functional/workflows_controller_test.rb index 3316b1f..8a8077e 100644 --- a/test/functional/workflows_controller_test.rb +++ b/test/functional/workflows_controller_test.rb @@ -284,10 +284,13 @@ class WorkflowsControllerTest < ActionController::TestCase def test_get_permissions_should_set_css_class WorkflowPermission.delete_all WorkflowPermission.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 1, :field_name => 'assigned_to_id', :rule => 'required') + cf = IssueCustomField.create!(:name => 'Foo', :field_format => 'string', :tracker_ids => [2]) + WorkflowPermission.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 1, :field_name => cf.id, :rule => 'required') get :permissions, :role_id => 1, :tracker_id => 2 assert_response :success assert_select 'td.required > select[name=?]', 'permissions[1][assigned_to_id]' + assert_select 'td.required > select[name=?]', "permissions[1][#{cf.id}]" end def test_post_permissions