meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Highlighting of required and read-only custom fields broken in Workflow editor (#22305).

Browse Source 
Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@15293 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-04-03 11:58:23 +00:00
parent 382b6911fd
commit 05d1df45da
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/workflows/permissions.html.erb
View File

@ -85,7 +85,7 @@
<%= field.name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %> <%= field.name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %>
</td> </td>
<% for status in @statuses -%> <% 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) %> <%= field_permission_tag(@permissions, status, field, @roles) %>
<% unless status == @statuses.last %><a href="#" class="repeat-value">&#187;</a><% end %> <% unless status == @statuses.last %><a href="#" class="repeat-value">&#187;</a><% end %>
</td> </td>

3
test/functional/workflows_controller_test.rb
View File

@ -284,10 +284,13 @@ class WorkflowsControllerTest < ActionController::TestCase
def test_get_permissions_should_set_css_class def test_get_permissions_should_set_css_class
WorkflowPermission.delete_all WorkflowPermission.delete_all
WorkflowPermission.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 1, :field_name => 'assigned_to_id', :rule => 'required') 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 get :permissions, :role_id => 1, :tracker_id => 2
assert_response :success assert_response :success
assert_select 'td.required > select[name=?]', 'permissions[1][assigned_to_id]' assert_select 'td.required > select[name=?]', 'permissions[1][assigned_to_id]'
assert_select 'td.required > select[name=?]', "permissions[1][#{cf.id}]"
end end
def test_post_permissions def test_post_permissions