diff options
| author | Go MAEDA <maeda@farend.jp> | 2020-02-29 14:18:39 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2020-02-29 14:18:39 +0000 |
| commit | e7a21a10a3fcde29570a832919010a2f006b00d8 (patch) | |
| tree | f121cd523d02681d5533d27a0f3ad1ad9ca24c8c | |
| parent | f21681218e7936502ad7801195ef3a5bca7281f1 (diff) | |
| download | redmine-e7a21a10a3fcde29570a832919010a2f006b00d8.tar.gz redmine-e7a21a10a3fcde29570a832919010a2f006b00d8.zip | |
Merged r19538 from trunk to 4.1-stable (#33059).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19543 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/workflows_controller.rb | 2 | ||||
| -rw-r--r-- | test/functional/workflows_controller_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb index de4f59a13..0c29b14a1 100644 --- a/app/controllers/workflows_controller.rb +++ b/app/controllers/workflows_controller.rb @@ -120,7 +120,7 @@ class WorkflowsController < ApplicationController def find_roles ids = Array.wrap(params[:role_id]) if ids == ['all'] - @roles = Role.sorted.to_a + @roles = Role.sorted.select(&:consider_workflow?) elsif ids.present? @roles = Role.where(:id => ids).to_a end diff --git a/test/functional/workflows_controller_test.rb b/test/functional/workflows_controller_test.rb index 51b3ec5d0..e1759ea03 100644 --- a/test/functional/workflows_controller_test.rb +++ b/test/functional/workflows_controller_test.rb @@ -97,8 +97,8 @@ class WorkflowsControllerTest < Redmine::ControllerTest get :edit, :params => {:role_id => 'all', :tracker_id => 'all'} assert_response :success - assert_select 'select[name=?][multiple=multiple]', 'role_id[]' do - assert_select 'option[selected=selected]', Role.all.count(&:consider_workflow?) + assert_select 'select[name=?]', 'role_id[]' do + assert_select 'option[selected=selected][value=all]' end assert_select 'select[name=?]', 'tracker_id[]' do assert_select 'option[selected=selected][value=all]' |