mirror of
https://github.com/redmine/redmine.git
synced 2025-11-12 08:16:03 +01:00
Don't show roles without issue add/edit permission in workflow setup (#15988).
git-svn-id: http://svn.redmine.org/redmine/trunk@13748 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -72,7 +72,7 @@ class WorkflowsController < ApplicationController
|
||||
end
|
||||
|
||||
def copy
|
||||
@roles = Role.sorted
|
||||
@roles = Role.sorted.select(&:consider_workflow?)
|
||||
@trackers = Tracker.sorted
|
||||
|
||||
if params[:source_tracker_id].blank? || params[:source_tracker_id] == 'any'
|
||||
|
||||
@@ -36,7 +36,7 @@ class WorkflowRule < ActiveRecord::Base
|
||||
target_roles = [target_roles].flatten.compact
|
||||
|
||||
target_trackers = Tracker.sorted.to_a if target_trackers.empty?
|
||||
target_roles = Role.all if target_roles.empty?
|
||||
target_roles = Role.all.select(&:consider_workflow?) if target_roles.empty?
|
||||
|
||||
target_trackers.each do |target_tracker|
|
||||
target_roles.each do |target_role|
|
||||
|
||||
@@ -21,7 +21,7 @@ class WorkflowTransition < WorkflowRule
|
||||
# Returns workflow transitions count by tracker and role
|
||||
def self.count_by_tracker_and_role
|
||||
counts = connection.select_all("SELECT role_id, tracker_id, count(id) AS c FROM #{table_name} WHERE type = 'WorkflowTransition' GROUP BY role_id, tracker_id")
|
||||
roles = Role.sorted
|
||||
roles = Role.sorted.to_a.select(&:consider_workflow?)
|
||||
trackers = Tracker.sorted
|
||||
result = []
|
||||
trackers.each do |tracker|
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<%= form_tag({}, :method => 'get') do %>
|
||||
<p>
|
||||
<label><%=l(:label_role)%>:
|
||||
<%= options_for_workflow_select 'role_id[]', Role.sorted, @roles, :id => 'role_id', :class => 'expandable' %>
|
||||
<%= options_for_workflow_select 'role_id[]', Role.sorted.select(&:consider_workflow?), @roles, :id => 'role_id', :class => 'expandable' %>
|
||||
</label>
|
||||
<a href="#" data-expands="#role_id"><%= image_tag 'bullet_toggle_plus.png' %></a>
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<%= form_tag({}, :method => 'get') do %>
|
||||
<p>
|
||||
<label><%=l(:label_role)%>:
|
||||
<%= options_for_workflow_select 'role_id[]', Role.sorted, @roles, :id => 'role_id', :class => 'expandable' %>
|
||||
<%= options_for_workflow_select 'role_id[]', Role.sorted.select(&:consider_workflow?), @roles, :id => 'role_id', :class => 'expandable' %>
|
||||
</label>
|
||||
<a href="#" data-expands="#role_id"><%= image_tag 'bullet_toggle_plus.png' %></a>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user