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

diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb
index de4f59a13a9fe08a31b523b39237669438f582dd..0c29b14a1d2611df5af55cc1610e1fa87696a398 100644 (file)
--- 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 51b3ec5d0866cb92f4a84096ace4ae3f091182f0..e1759ea0385b438091b9d053a9a640be8dfed8ac 100644 (file)
--- 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]'