Merged r15293 (#22305).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15306 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/workflows/permissions.html.erb b/app/views/workflows/permissions.html.erb
index 03740214d9f22e182721f9067458828d79462ff8..032aa9d84b2fc8530fd4b996ce98d84219d4c99f 100644 (file)
--- 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) %>
           </td>
           <% for status in @statuses -%>
-          <td class="<%= @permissions[status.id][field.id.to_s] %>">
+          <td class="<%= @permissions[status.id][field.id.to_s].try(:join, ' ') %>">
             <%= field_permission_tag(@permissions, status, field, @roles) %>
             <% unless status == @statuses.last %><a href="#" class="repeat-value">&#187;</a><% end %>
           </td>

diff --git a/test/functional/workflows_controller_test.rb b/test/functional/workflows_controller_test.rb
index 3316b1f715bebcaf28b884f7aad224d64cbf38c2..8a8077e3bcf27cf41bc43c190982f6b149624945 100644 (file)
--- 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