summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2020-02-29 14:18:39 +0000
committerGo MAEDA <maeda@farend.jp>2020-02-29 14:18:39 +0000
commite7a21a10a3fcde29570a832919010a2f006b00d8 (patch)
treef121cd523d02681d5533d27a0f3ad1ad9ca24c8c /app
parentf21681218e7936502ad7801195ef3a5bca7281f1 (diff)
downloadredmine-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
Diffstat (limited to 'app')
-rw-r--r--app/controllers/workflows_controller.rb2
1 files changed, 1 insertions, 1 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