diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-04-03 11:58:23 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-04-03 11:58:23 +0000 |
| commit | 05d1df45daa8dcc6fff3e893039e05b6b2f3d3ad (patch) | |
| tree | ae0cddef1af1ae62bedac7a4dd3d3f2b165d732f | |
| parent | 382b6911fdd94a3b021ef8da8c4e8c4cffbc5bb5 (diff) | |
| download | redmine-05d1df45daa8dcc6fff3e893039e05b6b2f3d3ad.tar.gz redmine-05d1df45daa8dcc6fff3e893039e05b6b2f3d3ad.zip | |
Highlighting of required and read-only custom fields broken in Workflow editor (#22305).
Patch by Go MAEDA.
git-svn-id: http://svn.redmine.org/redmine/trunk@15293 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/workflows/permissions.html.erb | 2 | ||||
| -rw-r--r-- | test/functional/workflows_controller_test.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/views/workflows/permissions.html.erb b/app/views/workflows/permissions.html.erb index 3b8f84e41..0fb4c8bb6 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) %> </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">»</a><% end %> </td> diff --git a/test/functional/workflows_controller_test.rb b/test/functional/workflows_controller_test.rb index 3316b1f71..8a8077e3b 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 |