jro_apps/redmine Commit - r12649:b6c794d16b47

Bulk edit workflows for multiple trackers/roles (#16164)....

Jean-Philippe Lang -

r12649:b6c794d16b47

parent child

Context file:

r12649:b6c794d16b47

Collapse all files

test/unit/workflow_transition_test.rb created 644 +93 0

@@ -0,0 +1,93
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2014 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.expand_path('../../test_helper', __FILE__)
	19
	20	class WorkflowTransitionTest < ActiveSupport::TestCase
	21	fixtures :roles, :trackers, :issue_statuses
	22
	23	def setup
	24	WorkflowTransition.delete_all
	25	end
	26
	27	def test_replace_transitions_should_create_enabled_transitions
	28	w = WorkflowTransition.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 2)
	29
	30	transitions = {'1' => {
	31	'2' => {'always' => '1'},
	32	'3' => {'always' => '1'}
	33	}}
	34	assert_difference 'WorkflowTransition.count' do
	35	WorkflowTransition.replace_transitions(Tracker.find(1), Role.find(1), transitions)
	36	end
	37	assert WorkflowTransition.where(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 3).exists?
	38	end
	39
	40	def test_replace_transitions_should_delete_disabled_transitions
	41	w1 = WorkflowTransition.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 2)
	42	w2 = WorkflowTransition.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 3)
	43
	44	transitions = {'1' => {
	45	'2' => {'always' => '0'},
	46	'3' => {'always' => '1'}
	47	}}
	48	assert_difference 'WorkflowTransition.count', -1 do
	49	WorkflowTransition.replace_transitions(Tracker.find(1), Role.find(1), transitions)
	50	end
	51	assert !WorkflowTransition.exists?(w1.id)
	52	end
	53
	54	def test_replace_transitions_should_create_enabled_additional_transitions
	55	transitions = {'1' => {
	56	'2' => {'always' => '0', 'assignee' => '0', 'author' => '1'}
	57	}}
	58	assert_difference 'WorkflowTransition.count' do
	59	WorkflowTransition.replace_transitions(Tracker.find(1), Role.find(1), transitions)
	60	end
	61	w = WorkflowTransition.where(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 2).first
	62	assert w
	63	assert_equal false, w.assignee
	64	assert_equal true, w.author
	65	end
	66
	67	def test_replace_transitions_should_delete_disabled_additional_transitions
	68	w = WorkflowTransition.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 2, :assignee => true)
	69
	70	transitions = {'1' => {
	71	'2' => {'always' => '0', 'assignee' => '0', 'author' => '0'}
	72	}}
	73	assert_difference 'WorkflowTransition.count', -1 do
	74	WorkflowTransition.replace_transitions(Tracker.find(1), Role.find(1), transitions)
	75	end
	76	assert !WorkflowTransition.exists?(w.id)
	77	end
	78
	79	def test_replace_transitions_should_update_additional_transitions
	80	WorkflowTransition.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 2, :assignee => true)
	81
	82	transitions = {'1' => {
	83	'2' => {'always' => '0', 'assignee' => '0', 'author' => '1'}
	84	}}
	85	assert_no_difference 'WorkflowTransition.count' do
	86	WorkflowTransition.replace_transitions(Tracker.find(1), Role.find(1), transitions)
	87	end
	88	w = WorkflowTransition.where(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 2).first
	89	assert w
	90	assert_equal false, w.assignee
	91	assert_equal true, w.author
	92	end
	93	end

app/controllers/workflows_controller.rb +57 -46

             # Redmine - project management software
             # Copyright (C) 2006-2014  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class WorkflowsController < ApplicationController
               layout 'admin'
-              before_filter :require_admin, :find_roles, :find_trackers
+              before_filter :require_admin
               def index
                 @workflow_counts = WorkflowTransition.count_by_tracker_and_role
               end
               def edit
-                @role = Role.find_by_id(params[:role_id]) if params[:role_id]
+                find_trackers_roles_and_statuses_for_edit
-                @tracker = Tracker.find_by_id(params[:tracker_id]) if params[:tracker_id]
-                if request.post?
+                if request.post? && @roles && @trackers && params[:transitions]
-                  WorkflowTransition.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
+                  transitions = params[:transitions].deep_dup
-                  (params[:issue_status] || []).each { |status_id, transitions|
+                  transitions.each do |old_status_id, transitions_by_new_status|
-                    transitions.each { |new_status_id, options|
+                    transitions_by_new_status.each do |new_status_id, transition_by_rule|
-                      author = options.is_a?(Array) && options.include?('author') && !options.include?('always')
+                      transition_by_rule.reject! {|rule, transition| transition == 'no_change'}
-                      assignee = options.is_a?(Array) && options.include?('assignee') && !options.include?('always')
+                    end
-                      WorkflowTransition.create(:role_id => @role.id, :tracker_id => @tracker.id, :old_status_id => status_id, :new_status_id => new_status_id, :author => author, :assignee => assignee)
-                  if @role.save
-                    flash[:notice] = l(:notice_successful_update)
-                    redirect_to workflows_edit_path(:role_id => @role, :tracker_id => @tracker, :used_statuses_only => params[:used_statuses_only])
-                    return
                   end
+                  WorkflowTransition.replace_transitions(@trackers, @roles, transitions)
+                  flash[:notice] = l(:notice_successful_update)
+                  redirect_to_referer_or workflows_edit_path
+                  return
                 end
-                @used_statuses_only = (params[:used_statuses_only] == '0' ? false : true)
+                if @trackers && @roles && @statuses.any?
-                if @tracker && @used_statuses_only && @tracker.issue_statuses.any?
+                  workflows = WorkflowTransition.where(:role_id => @roles.map(&:id), :tracker_id => @trackers.map(&:id)).all
-                  @statuses = @tracker.issue_statuses
-                end
-                @statuses ||= IssueStatus.sorted.all
-                if @tracker && @role && @statuses.any?
-                  workflows = WorkflowTransition.where(:role_id => @role.id, :tracker_id => @tracker.id).all
                   @workflows = {}
                   @workflows['always'] = workflows.select {|w| !w.author && !w.assignee}
                   @workflows['author'] = workflows.select {|w| w.author}
                   @workflows['assignee'] = workflows.select {|w| w.assignee}
                 end
               end
               def permissions
-                @role = Role.find_by_id(params[:role_id]) if params[:role_id]
+                find_trackers_roles_and_statuses_for_edit
-                @tracker = Tracker.find_by_id(params[:tracker_id]) if params[:tracker_id]
-                if request.post? && @role && @tracker
+                if request.post? && @roles && @trackers && params[:permissions]
-                  WorkflowPermission.replace_permissions(@tracker, @role, params[:permissions] || {})
+                  permissions = params[:permissions].deep_dup
+                  permissions.each { |field, rule_by_status_id|
+                    rule_by_status_id.reject! {|status_id, rule| rule == 'no_change'}
+                  }
+                  WorkflowPermission.replace_permissions(@trackers, @roles, permissions)
                   flash[:notice] = l(:notice_successful_update)
-                  redirect_to workflows_permissions_path(:role_id => @role, :tracker_id => @tracker, :used_statuses_only => params[:used_statuses_only])
+                  redirect_to_referer_or workflows_permissions_path
                   return
                 end
-                @used_statuses_only = (params[:used_statuses_only] == '0' ? false : true)
+                if @roles && @trackers
-                if @tracker && @used_statuses_only && @tracker.issue_statuses.any?
+                  @fields = (Tracker::CORE_FIELDS_ALL - @trackers.map(&:disabled_core_fields).reduce(:&)).map {|field| [field, l("field_"+field.sub(/_id$/, ''))]}
-                  @statuses = @tracker.issue_statuses
+                  @custom_fields = @trackers.map(&:custom_fields).flatten.uniq.sort
-                end
+                  @permissions = WorkflowPermission.rules_by_status_id(@trackers, @roles)
-                @statuses ||= IssueStatus.sorted.all
-                if @role && @tracker
-                  @fields = (Tracker::CORE_FIELDS_ALL - @tracker.disabled_core_fields).map {|field| [field, l("field_"+field.sub(/_id$/, ''))]}
-                  @custom_fields = @tracker.custom_fields
-                  @permissions = WorkflowPermission.
-                      where(:tracker_id => @tracker.id, :role_id => @role.id).inject({}) do |h, w|
-                    h[w.old_status_id] ||= {}
-                    h[w.old_status_id][w.field_name] = w.rule
-                  end
                   @statuses.each {|status| @permissions[status.id] ||= {}}
                 end
               end
               def copy
+                @roles = Role.sorted
+                @trackers = Tracker.sorted
                 if params[:source_tracker_id].blank? || params[:source_tracker_id] == 'any'
                   @source_tracker = nil
                 else
                   @source_tracker = Tracker.find_by_id(params[:source_tracker_id].to_i)
                 end
                 if params[:source_role_id].blank? || params[:source_role_id] == 'any'
                   @source_role = nil
                 else
                   @source_role = Role.find_by_id(params[:source_role_id].to_i)
                 end
                 @target_trackers = params[:target_tracker_ids].blank? ?
                     nil : Tracker.where(:id => params[:target_tracker_ids]).all
                 @target_roles = params[:target_role_ids].blank? ?
                     nil : Role.where(:id => params[:target_role_ids]).all
                 if request.post?
                   if params[:source_tracker_id].blank? || params[:source_role_id].blank? || (@source_tracker.nil? && @source_role.nil?)
                     flash.now[:error] = l(:error_workflow_copy_source)
                   elsif @target_trackers.blank? || @target_roles.blank?
                     flash.now[:error] = l(:error_workflow_copy_target)
                   else
                     WorkflowRule.copy(@source_tracker, @source_role, @target_trackers, @target_roles)
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to workflows_copy_path(:source_tracker_id => @source_tracker, :source_role_id => @source_role)
                   end
                 end
               end
               private
+              def find_trackers_roles_and_statuses_for_edit
+                find_roles
+                find_trackers
+                find_statuses
+              end
               def find_roles
-                @roles = Role.sorted.all
+                ids = Array.wrap(params[:role_id])
+                if ids == ['all']
+                  @roles = Role.sorted.all
+                elsif ids.present?
+                  @roles = Role.where(:id => ids).all
+                end
+                @roles = nil if @roles.blank?
               end
               def find_trackers
-                @trackers = Tracker.sorted.all
+                ids = Array.wrap(params[:tracker_id])
+                if ids == ['all']
+                  @trackers = Tracker.sorted.all
+                elsif ids.present?
+                  @trackers = Tracker.where(:id => ids).all
+                end
+                @trackers = nil if @trackers.blank?
+              end
+              def find_statuses
+                @used_statuses_only = (params[:used_statuses_only] == '0' ? false : true)
+                if @trackers && @used_statuses_only
+                  @statuses = @trackers.map(&:issue_statuses).flatten.uniq.sort.presence
+                end
+                @statuses ||= IssueStatus.sorted.all
               end
             end

app/helpers/workflows_helper.rb +54 -4

@@ -1,41 +1,91
1	# encoding: utf-8	1	# encoding: utf-8
2	#	2	#
3	# Redmine - project management software	3	# Redmine - project management software
4	# Copyright (C) 2006-2014 Jean-Philippe Lang	4	# Copyright (C) 2006-2014 Jean-Philippe Lang
5	#	5	#
6	# This program is free software; you can redistribute it and/or	6	# This program is free software; you can redistribute it and/or
7	# modify it under the terms of the GNU General Public License	7	# modify it under the terms of the GNU General Public License
8	# as published by the Free Software Foundation; either version 2	8	# as published by the Free Software Foundation; either version 2
9	# of the License, or (at your option) any later version.	9	# of the License, or (at your option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the GNU General Public License	16	# You should have received a copy of the GNU General Public License
17	# along with this program; if not, write to the Free Software	17	# along with this program; if not, write to the Free Software
18	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	18	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19		19
20	module WorkflowsHelper	20	module WorkflowsHelper
		21	def options_for_workflow_select(name, objects, selected, options={})
		22	option_tags = ''.html_safe
		23	multiple = false
		24	if selected
		25	if selected.size == objects.size
		26	selected = 'all'
		27	else
		28	selected = selected.map(&:id)
		29	if selected.size > 1
		30	multiple = true
		31	end
		32	end
		33	else
		34	selected = objects.first.try(:id)
		35	end
		36	all_tag_options = {:value => 'all', :selected => (selected == 'all')}
		37	if multiple
		38	all_tag_options.merge!(:style => "display:none;")
		39	end
		40	option_tags << content_tag('option', 'All', all_tag_options)
		41	option_tags << options_from_collection_for_select(objects, "id", "name", selected)
		42	select_tag name, option_tags, {:multiple => multiple}.merge(options)
		43	end
		44
21	def field_required?(field)	45	def field_required?(field)
22	field.is_a?(CustomField) ? field.is_required? : %w(project_id tracker_id subject priority_id is_private).include?(field)	46	field.is_a?(CustomField) ? field.is_required? : %w(project_id tracker_id subject priority_id is_private).include?(field)
23	end	47	end
24		48
25	def field_permission_tag(permissions, status, field, role)	49	def field_permission_tag(permissions, status, field, roles)
26	name = field.is_a?(CustomField) ? field.id.to_s : field	50	name = field.is_a?(CustomField) ? field.id.to_s : field
27	options = [["", ""], [l(:label_readonly), "readonly"]]	51	options = [["", ""], [l(:label_readonly), "readonly"]]
28	options << [l(:label_required), "required"] unless field_required?(field)	52	options << [l(:label_required), "required"] unless field_required?(field)
29	html_options = {}	53	html_options = {}
30	selected = permissions[status.id][name]	54
		55	if perm = permissions[status.id][name]
		56	if perm.uniq.size > 1 \|\| perm.size < @roles.size * @trackers.size
		57	options << [l(:label_no_change_option), "no_change"]
		58	selected = 'no_change'
		59	else
		60	selected = perm.first
		61	end
		62	end
		63
		64	hidden = field.is_a?(CustomField) &&
		65	!field.visible? &&
		66	!roles.detect {\|role\| role.custom_fields.to_a.include?(field)}
31		67
32	hidden = field.is_a?(CustomField) && !field.visible? && !role.custom_fields.to_a.include?(field)
33	if hidden	68	if hidden
34	options[0][0] = l(:label_hidden)	69	options[0][0] = l(:label_hidden)
35	selected = ''	70	selected = ''
36	html_options[:disabled] = true	71	html_options[:disabled] = true
37	end	72	end
38		73
39	select_tag("permissions[#{~~name~~}][#{~~status~~.id}]", options_for_select(options, selected), html_options)	74	select_tag("permissions[#{status.id}][#{name}]", options_for_select(options, selected), html_options)
		75	end
		76
		77	def transition_tag(workflows, old_status, new_status, name)
		78	w = workflows.select {\|w\| w.old_status_id == old_status.id && w.new_status_id == new_status.id}.size
		79
		80	tag_name = "transitions[#{ old_status.id }][#{new_status.id}][#{name}]"
		81	if w == 0 \|\| w == @roles.size * @trackers.size
		82
		83	hidden_field_tag(tag_name, "0") +
		84	check_box_tag(tag_name, "1", w != 0,
		85	:class => "old-status-#{old_status.id} new-status-#{new_status.id}")
		86	else
		87	select_tag tag_name,
		88	options_for_select([["Oui", "1"], ["Non", "0"], [l(:label_no_change_option), "no_change"]], "no_change")
		89	end
40	end	90	end
41	end	91	end

app/models/workflow_permission.rb +33 -10

             # Redmine - project management software
             # Copyright (C) 2006-2014  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class WorkflowPermission < WorkflowRule
               validates_inclusion_of :rule, :in => %w(readonly required)
               validate :validate_field_name
-              # Replaces the workflow permissions for the given tracker and role
+              # Returns the workflow permissions for the given trackers and roles
+              # grouped by status_id
               #
               # Example:
-              #   WorkflowPermission.replace_permissions role, tracker, {'due_date' => {'1' => 'readonly', '2' => 'required'}}
+              #   WorkflowPermission.rules_by_status_id trackers, roles
-              def self.replace_permissions(tracker, role, permissions)
+              #   # => {1 => {'start_date' => 'required', 'due_date' => 'readonly'}}
-                destroy_all(:tracker_id => tracker.id, :role_id => role.id)
+              def self.rules_by_status_id(trackers, roles)
+                WorkflowPermission.where(:tracker_id => trackers.map(&:id), :role_id => roles.map(&:id)).inject({}) do |h, w|
+                  h[w.old_status_id] ||= {}
+                  h[w.old_status_id][w.field_name] ||= []
+                  h[w.old_status_id][w.field_name] << w.rule
+                  h
+                end
+              end
-                permissions.each { |field, rule_by_status_id|
+              # Replaces the workflow permissions for the given trackers and roles
-                  rule_by_status_id.each { |status_id, rule|
-                    if rule.present?
+              # Example:
-                      WorkflowPermission.create(:role_id => role.id, :tracker_id => tracker.id, :old_status_id => status_id, :field_name => field, :rule => rule)
+              #   WorkflowPermission.replace_permissions trackers, roles, {'1' => {'start_date' => 'required', 'due_date' => 'readonly'}}
-                    end
+              def self.replace_permissions(trackers, roles, permissions)
+                trackers = Array.wrap trackers
+                roles = Array.wrap roles
+                transaction do
+                  permissions.each { |status_id, rule_by_field|
+                    rule_by_field.each { |field, rule|
+                      destroy_all(:tracker_id => trackers.map(&:id), :role_id => roles.map(&:id), :old_status_id => status_id, :field_name => field)
+                      if rule.present?
+                        trackers.each do |tracker|
+                          roles.each do |role|
+                            WorkflowPermission.create(:role_id => role.id, :tracker_id => tracker.id, :old_status_id => status_id, :field_name => field, :rule => rule)
+                          end
+                        end
+                      end
+                    }
                   }
+                end
               end
               protected
               def validate_field_name
                 unless Tracker::CORE_FIELDS_ALL.include?(field_name) || field_name.to_s.match(/^\d+$/)
                   errors.add :field_name, :invalid
                 end
               end
             end

app/models/workflow_transition.rb +65 0

@@ -1,39 +1,104
1	# Redmine - project management software	1	# Redmine - project management software
2	# Copyright (C) 2006-2014 Jean-Philippe Lang	2	# Copyright (C) 2006-2014 Jean-Philippe Lang
3	#	3	#
4	# This program is free software; you can redistribute it and/or	4	# This program is free software; you can redistribute it and/or
5	# modify it under the terms of the GNU General Public License	5	# modify it under the terms of the GNU General Public License
6	# as published by the Free Software Foundation; either version 2	6	# as published by the Free Software Foundation; either version 2
7	# of the License, or (at your option) any later version.	7	# of the License, or (at your option) any later version.
8	#	8	#
9	# This program is distributed in the hope that it will be useful,	9	# This program is distributed in the hope that it will be useful,
10	# but WITHOUT ANY WARRANTY; without even the implied warranty of	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12	# GNU General Public License for more details.	12	# GNU General Public License for more details.
13	#	13	#
14	# You should have received a copy of the GNU General Public License	14	# You should have received a copy of the GNU General Public License
15	# along with this program; if not, write to the Free Software	15	# along with this program; if not, write to the Free Software
16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17		17
18	class WorkflowTransition < WorkflowRule	18	class WorkflowTransition < WorkflowRule
19	validates_presence_of :new_status	19	validates_presence_of :new_status
20		20
21	# Returns workflow transitions count by tracker and role	21	# Returns workflow transitions count by tracker and role
22	def self.count_by_tracker_and_role	22	def self.count_by_tracker_and_role
23	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")	23	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")
24	roles = Role.sorted.all	24	roles = Role.sorted.all
25	trackers = Tracker.sorted.all	25	trackers = Tracker.sorted.all
26		26
27	result = []	27	result = []
28	trackers.each do \|tracker\|	28	trackers.each do \|tracker\|
29	t = []	29	t = []
30	roles.each do \|role\|	30	roles.each do \|role\|
31	row = counts.detect {\|c\| c['role_id'].to_s == role.id.to_s && c['tracker_id'].to_s == tracker.id.to_s}	31	row = counts.detect {\|c\| c['role_id'].to_s == role.id.to_s && c['tracker_id'].to_s == tracker.id.to_s}
32	t << [role, (row.nil? ? 0 : row['c'].to_i)]	32	t << [role, (row.nil? ? 0 : row['c'].to_i)]
33	end	33	end
34	result << [tracker, t]	34	result << [tracker, t]
35	end	35	end
36		36
37	result	37	result
38	end	38	end
		39
		40	def self.replace_transitions(trackers, roles, transitions)
		41	trackers = Array.wrap trackers
		42	roles = Array.wrap roles
		43
		44	transaction do
		45	records = WorkflowTransition.where(:tracker_id => trackers.map(&:id), :role_id => roles.map(&:id)).all
		46
		47	transitions.each do \|old_status_id, transitions_by_new_status\|
		48	transitions_by_new_status.each do \|new_status_id, transition_by_rule\|
		49	transition_by_rule.each do \|rule, transition\|
		50	trackers.each do \|tracker\|
		51	roles.each do \|role\|
		52	w = records.select {\|r\|
		53	r.old_status_id == old_status_id.to_i &&
		54	r.new_status_id == new_status_id.to_i &&
		55	r.tracker_id == tracker.id &&
		56	r.role_id == role.id &&
		57	!r.destroyed?
		58	}
		59
		60	if rule == 'always'
		61	w = w.select {\|r\| !r.author && !r.assignee}
		62	else
		63	w = w.select {\|r\| r.author \|\| r.assignee}
		64	end
		65	if w.size > 1
		66	w[1..-1].each(&:destroy)
		67	end
		68	w = w.first
		69
		70	if transition == "1" \|\| transition == true
		71	unless w
		72	w = WorkflowTransition.new(:old_status_id => old_status_id, :new_status_id => new_status_id, :tracker_id => tracker.id, :role_id => role.id)
		73	records << w
		74	end
		75	w.author = true if rule == "author"
		76	w.assignee = true if rule == "assignee"
		77	w.save if w.changed?
		78	elsif w
		79	if rule == 'always'
		80	w.destroy
		81	elsif rule == 'author'
		82	if w.assignee
		83	w.author = false
		84	w.save if w.changed?
		85	else
		86	w.destroy
		87	end
		88	elsif rule == 'assignee'
		89	if w.author
		90	w.assignee = false
		91	w.save if w.changed?
		92	else
		93	w.destroy
		94	end
		95	end
		96	end
		97	end
		98	end
		99	end
		100	end
		101	end
		102	end
		103	end
39	end	104	end

app/views/workflows/_form.html.erb +2 -3

-            <table class="list transitions transitions-<%= name %>">
+            <table class="list workflows transitions transitions-<%= name %>">
             <thead>
               <tr>
                 <th>
                   <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('table.transitions-#{name} input')",
                                                                       :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
                   <%=l(:label_current_status)%>
                 </th>
                 <th colspan="<%= @statuses.length %>"><%=l(:label_new_statuses_allowed)%></th>
               </tr>
               <tr>
                 <td></td>
                 <% for new_status in @statuses %>
                 <td style="width:<%= 75 / @statuses.size %>%;">
                   <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('table.transitions-#{name} input.new-status-#{new_status.id}')",
                                                                   :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
                   <%=h new_status.name %>
                 </td>
                 <% end %>
               </tr>
             </thead>
             <tbody>
               <% for old_status in @statuses %>
               <tr class="<%= cycle("odd", "even") %>">
                 <td class="name">
                   <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('table.transitions-#{name} input.old-status-#{old_status.id}')",
                                                                       :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
                   <%=h old_status.name %>
                 </td>
                 <% for new_status in @statuses -%>
                 <% checked = workflows.detect {|w| w.old_status_id == old_status.id && w.new_status_id == new_status.id} %>
                 <td class="<%= checked ? 'enabled' : '' %>">
-                  <%= check_box_tag "issue_status[#{ old_status.id }][#{new_status.id}][]", name, checked,
+                  <%= transition_tag workflows, old_status, new_status, name %>
-                        :class => "old-status-#{old_status.id} new-status-#{new_status.id}" %>
                 </td>
                 <% end -%>
               </tr>
               <% end %>
             </tbody>
             </table>

app/views/workflows/edit.html.erb +26 -7

             <%= render :partial => 'action_menu' %>
             <%= title l(:label_workflow) %>
             <div class="tabs">
               <ul>
-                <li><%= link_to l(:label_status_transitions), {:action => 'edit', :role_id => @role, :tracker_id => @tracker}, :class => 'selected' %></li>
+                <li><%= link_to l(:label_status_transitions), workflows_edit_path(:role_id => @roles, :tracker_id => @trackers), :class => 'selected' %></li>
-                <li><%= link_to l(:label_fields_permissions), {:action => 'permissions', :role_id => @role, :tracker_id => @tracker} %></li>
+                <li><%= link_to l(:label_fields_permissions), workflows_permissions_path(:role_id => @roles, :tracker_id => @trackers) %></li>
               </ul>
             </div>
             <p><%=l(:text_workflow_edit)%>:</p>
             <%= form_tag({}, :method => 'get') do %>
             <p>
               <label><%=l(:label_role)%>:
-              <%= select_tag 'role_id', options_from_collection_for_select(@roles, "id", "name", @role && @role.id) %></label>
+              <%= options_for_workflow_select 'role_id[]', Role.sorted, @roles, :id => 'role_id', :class => 'expandable' %>
+              </label>
+              <a href="#" data-expands="#role_id"><%= image_tag 'bullet_toggle_plus.png' %></a>
               <label><%=l(:label_tracker)%>:
-              <%= select_tag 'tracker_id', options_from_collection_for_select(@trackers, "id", "name", @tracker && @tracker.id) %></label>
+              <%= options_for_workflow_select 'tracker_id[]', Tracker.sorted, @trackers, :id => 'tracker_id', :class => 'expandable' %>
+              </label>
+              <a href="#" data-expands="#tracker_id"><%= image_tag 'bullet_toggle_plus.png' %></a>
               <%= submit_tag l(:button_edit), :name => nil %>
               <%= hidden_field_tag 'used_statuses_only', '0' %>
               <label><%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %></label>
             </p>
             <% end %>
-            <% if @tracker && @role && @statuses.any? %>
+            <% if @trackers && @roles && @statuses.any? %>
               <%= form_tag({}, :id => 'workflow_form' ) do %>
-                <%= hidden_field_tag 'tracker_id', @tracker.id %>
+                <%= @trackers.map {|tracker| hidden_field_tag 'tracker_id[]', tracker.id}.join.html_safe %>
-                <%= hidden_field_tag 'role_id', @role.id %>
+                <%= @roles.map {|role| hidden_field_tag 'role_id[]', role.id}.join.html_safe %>
                 <%= hidden_field_tag 'used_statuses_only', params[:used_statuses_only] %>
                 <div class="autoscroll">
                   <%= render :partial => 'form', :locals => {:name => 'always', :workflows => @workflows['always']} %>
                   <fieldset class="collapsible" style="padding: 0; margin-top: 0.5em;">
                     <legend onclick="toggleFieldset(this);"><%= l(:label_additional_workflow_transitions_for_author) %></legend>
                     <div id="author_workflows" style="margin: 0.5em 0 0.5em 0;">
                       <%= render :partial => 'form', :locals => {:name => 'author', :workflows => @workflows['author']} %>
                     </div>
                   </fieldset>
                   <%= javascript_tag "hideFieldset($('#author_workflows'))" unless @workflows['author'].present? %>
                   <fieldset class="collapsible" style="padding: 0;">
                     <legend onclick="toggleFieldset(this);"><%= l(:label_additional_workflow_transitions_for_assignee) %></legend>
                     <div id="assignee_workflows" style="margin: 0.5em 0 0.5em 0;">
                   <%= render :partial => 'form', :locals => {:name => 'assignee', :workflows => @workflows['assignee']} %>
                     </div>
                   </fieldset>
                   <%= javascript_tag "hideFieldset($('#assignee_workflows'))" unless @workflows['assignee'].present? %>
                 </div>
                 <%= submit_tag l(:button_save) %>
               <% end %>
             <% end %>
+            <%= javascript_tag do %>
+            $("a[data-expands]").click(function(e){
+              e.preventDefault();
+              var target = $($(this).attr("data-expands"));
+              if (target.attr("multiple")) {
+                target.attr("multiple", false);
+                target.find("option[value=all]").show();
+              } else {
+                target.attr("multiple", true);
+                target.find("option[value=all]").attr("selected", false).hide();
+              }
+            });
+            <% end %>

app/views/workflows/permissions.html.erb +27 -10

             <%= render :partial => 'action_menu' %>
             <%= title l(:label_workflow) %>
             <div class="tabs">
               <ul>
-                <li><%= link_to l(:label_status_transitions), {:action => 'edit', :role_id => @role, :tracker_id => @tracker} %></li>
+                <li><%= link_to l(:label_status_transitions), workflows_edit_path(:role_id => @roles, :tracker_id => @trackers) %></li>
-                <li><%= link_to l(:label_fields_permissions), {:action => 'permissions', :role_id => @role, :tracker_id => @tracker}, :class => 'selected' %></li>
+                <li><%= link_to l(:label_fields_permissions), workflows_permissions_path(:role_id => @roles, :tracker_id => @trackers), :class => 'selected' %></li>
               </ul>
             </div>
             <p><%=l(:text_workflow_edit)%>:</p>
             <%= form_tag({}, :method => 'get') do %>
             <p>
               <label><%=l(:label_role)%>:
-              <%= select_tag 'role_id', options_from_collection_for_select(@roles, "id", "name", @role && @role.id) %></label>
+              <%= options_for_workflow_select 'role_id[]', Role.sorted, @roles, :id => 'role_id', :class => 'expandable' %>
+              </label>
+              <a href="#" data-expands="#role_id"><%= image_tag 'bullet_toggle_plus.png' %></a>
               <label><%=l(:label_tracker)%>:
-              <%= select_tag 'tracker_id', options_from_collection_for_select(@trackers, "id", "name", @tracker && @tracker.id) %></label>
+              <%= options_for_workflow_select 'tracker_id[]', Tracker.sorted, @trackers, :id => 'tracker_id', :class => 'expandable' %>
+              </label>
+              <a href="#" data-expands="#tracker_id"><%= image_tag 'bullet_toggle_plus.png' %></a>
               <%= submit_tag l(:button_edit), :name => nil %>
               <%= hidden_field_tag 'used_statuses_only', '0' %>
               <label><%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %></label>
             </p>
             <% end %>
-            <% if @tracker && @role && @statuses.any? %>
+            <% if @trackers && @roles && @statuses.any? %>
               <%= form_tag({}, :id => 'workflow_form' ) do %>
-                <%= hidden_field_tag 'tracker_id', @tracker.id %>
+                <%= @trackers.map {|tracker| hidden_field_tag 'tracker_id[]', tracker.id}.join.html_safe %>
-                <%= hidden_field_tag 'role_id', @role.id %>
+                <%= @roles.map {|role| hidden_field_tag 'role_id[]', role.id}.join.html_safe %>
                 <%= hidden_field_tag 'used_statuses_only', params[:used_statuses_only] %>
                 <div class="autoscroll">
-                <table class="list fields_permissions">
+                <table class="list workflows fields_permissions">
                 <thead>
                   <tr>
                     <th>
                     </th>
                     <th colspan="<%= @statuses.length %>"><%=l(:label_issue_status)%></th>
                   </tr>
                   <tr>
                     <td></td>
                     <% for status in @statuses %>
                     <td style="width:<%= 75 / @statuses.size %>%;">
                       <%=h status.name %>
                     </td>
                     <% end %>
                   </tr>
                 </thead>
                 <tbody>
                   <tr class="group open">
                     <td colspan="<%= @statuses.size + 1 %>">
                       <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
                       <%= l(:field_core_fields) %>
                     </td>
                   </tr>
                   <% @fields.each do |field, name| %>
                   <tr class="<%= cycle("odd", "even") %>">
                     <td class="name">
                       <%=h name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %>
                     </td>
                     <% for status in @statuses -%>
                     <td class="<%= @permissions[status.id][field] %>">
-                      <%= field_permission_tag(@permissions, status, field, @role) %>
+                      <%= field_permission_tag(@permissions, status, field, @roles) %>
                       <% unless status == @statuses.last %><a href="#" class="repeat-value">&#187;</a><% end %>
                     </td>
                     <% end -%>
                   </tr>
                   <% end %>
                   <% if @custom_fields.any? %>
                     <tr class="group open">
                       <td colspan="<%= @statuses.size + 1 %>">
                         <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
                         <%= l(:label_custom_field_plural) %>
                       </td>
                     </tr>
                     <% @custom_fields.each do |field| %>
                     <tr class="<%= cycle("odd", "even") %>">
                       <td class="name">
                         <%=h field.name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %>
                       </td>
                       <% for status in @statuses -%>
                       <td class="<%= @permissions[status.id][field.id.to_s] %>">
-                        <%= field_permission_tag(@permissions, status, field, @role) %>
+                        <%= field_permission_tag(@permissions, status, field, @roles) %>
                         <% unless status == @statuses.last %><a href="#" class="repeat-value">&#187;</a><% end %>
                       </td>
                       <% end -%>
                     </tr>
                     <% end %>
                   <% end %>
                 </tbody>
                 </table>
                 </div>
                 <%= submit_tag l(:button_save) %>
               <% end %>
             <% end %>
             <%= javascript_tag do %>
             $("a.repeat-value").click(function(e){
               e.preventDefault();
               var td = $(this).closest('td');
               var selected = td.find("select").find(":selected").val();
               td.nextAll('td').find("select").val(selected);
             });
+            $("a[data-expands]").click(function(e){
+              e.preventDefault();
+              var target = $($(this).attr("data-expands"));
+              if (target.attr("multiple")) {
+                target.attr("multiple", false);
+                target.find("option[value=all]").show();
+              } else {
+                target.attr("multiple", true);
+                target.find("option[value=all]").attr("selected", false).hide();
+              }
+            });
             <% end %>

public/stylesheets/application.css +6 -2

             html {overflow-y:scroll;}
             body { font-family: Verdana, sans-serif; font-size: 12px; color:#484848; margin: 0; padding: 0; min-width: 900px; }
             h1, h2, h3, h4 {font-family: "Trebuchet MS", Verdana, sans-serif;padding: 2px 10px 1px 0px;margin: 0 0 10px 0;}
             #content h1, h2, h3, h4 {color: #555;}
             h2, .wiki h1 {font-size: 20px;}
             h3, .wiki h2 {font-size: 16px;}
             h4, .wiki h3 {font-size: 13px;}
             h4 {border-bottom: 1px dotted #bbb;}
             /***** Layout *****/
             #wrapper {background: white;}
             #top-menu {background: #3E5B76; color: #fff; height:1.8em; font-size: 0.8em; padding: 2px 2px 0px 6px;}
             #top-menu ul {margin: 0;  padding: 0;}
             #top-menu li {
               float:left;
               list-style-type:none;
               margin: 0px 0px 0px 0px;
               padding: 0px 0px 0px 0px;
               white-space:nowrap;
             }
             #top-menu a {color: #fff; margin-right: 8px; font-weight: bold;}
             #top-menu #loggedas { float: right; margin-right: 0.5em; color: #fff; }
             #account {float:right;}
             #header {min-height:5.3em;margin:0;background-color:#628DB6;color:#f8f8f8; padding: 4px 8px 20px 6px; position:relative;}
             #header a {color:#f8f8f8;}
             #header h1 a.ancestor { font-size: 80%; }
             #quick-search {float:right;}
             #main-menu {position: absolute;  bottom: 0px;  left:6px; margin-right: -500px;}
             #main-menu ul {margin: 0;  padding: 0;}
             #main-menu li {
               float:left;
               list-style-type:none;
               margin: 0px 2px 0px 0px;
               padding: 0px 0px 0px 0px;
               white-space:nowrap;
             }
             #main-menu li a {
               display: block;
               color: #fff;
               text-decoration: none;
               font-weight: bold;
               margin: 0;
               padding: 4px 10px 4px 10px;
             }
             #main-menu li a:hover {background:#759FCF; color:#fff;}
             #main-menu li a.selected, #main-menu li a.selected:hover {background:#fff; color:#555;}
             #admin-menu ul {margin: 0;  padding: 0;}
             #admin-menu li {margin: 0;  padding: 0 0 6px 0; list-style-type:none;}
             #admin-menu a { background-position: 0% 40%; background-repeat: no-repeat; padding-left: 20px; padding-top: 2px; padding-bottom: 3px;}
             #admin-menu a.projects { background-image: url(../images/projects.png); }
             #admin-menu a.users { background-image: url(../images/user.png); }
             #admin-menu a.groups { background-image: url(../images/group.png); }
             #admin-menu a.roles { background-image: url(../images/database_key.png); }
             #admin-menu a.trackers { background-image: url(../images/ticket.png); }
             #admin-menu a.issue_statuses { background-image: url(../images/ticket_edit.png); }
             #admin-menu a.workflows { background-image: url(../images/ticket_go.png); }
             #admin-menu a.custom_fields { background-image: url(../images/textfield.png); }
             #admin-menu a.enumerations { background-image: url(../images/text_list_bullets.png); }
             #admin-menu a.settings { background-image: url(../images/changeset.png); }
             #admin-menu a.plugins { background-image: url(../images/plugin.png); }
             #admin-menu a.info { background-image: url(../images/help.png); }
             #admin-menu a.server_authentication { background-image: url(../images/server_key.png); }
             #main {background-color:#EEEEEE;}
             #sidebar{ float: right; width: 22%; position: relative; z-index: 9; padding: 0; margin: 0;}
             * html #sidebar{ width: 22%; }
             #sidebar h3{ font-size: 14px; margin-top:14px; color: #666;  }
             #sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; }
             * html #sidebar hr{ width: 95%; position: relative; left: -6px; color: #ccc; }
             #sidebar .contextual { margin-right: 1em; }
             #sidebar ul {margin: 0;  padding: 0;}
             #sidebar ul li {list-style-type:none;margin: 0px 2px 0px 0px; padding: 0px 0px 0px 0px;}
             #content { width: 75%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; }
             * html #content{ width: 75%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;}
             html>body #content { min-height: 600px; }
             * html body #content { height: 600px; } /* IE */
             #main.nosidebar #sidebar{ display: none; }
             #main.nosidebar #content{ width: auto; border-right: 0; }
             #footer {clear: both; border-top: 1px solid #bbb; font-size: 0.9em; color: #aaa; padding: 5px; text-align:center; background:#fff;}
             #login-form table {margin-top:5em; padding:1em; margin-left: auto; margin-right: auto; border: 2px solid #FDBF3B; background-color:#FFEBC1; }
             #login-form table td {padding: 6px;}
             #login-form label {font-weight: bold;}
             #login-form input#username, #login-form input#password { width: 300px; }
             div.modal { border-radius:5px; background:#fff; z-index:50; padding:4px;}
             div.modal h3.title {display:none;}
             div.modal p.buttons {text-align:right; margin-bottom:0;}
             input#openid_url { background: url(../images/openid-bg.gif) no-repeat; background-color: #fff; background-position: 0 50%; padding-left: 18px; }
             .clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
             /***** Links *****/
             a, a:link, a:visited{ color: #169; text-decoration: none; }
             a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
             a img{ border: 0; }
             a.issue.closed, a.issue.closed:link, a.issue.closed:visited { color: #999; text-decoration: line-through; }
             a.project.closed, a.project.closed:link, a.project.closed:visited { color: #999; }
             a.user.locked, a.user.locked:link, a.user.locked:visited {color: #999;}
             #sidebar a.selected {line-height:1.7em; padding:1px 3px 2px 2px; margin-left:-2px; background-color:#9DB9D5; color:#fff; border-radius:2px;}
             #sidebar a.selected:hover {text-decoration:none;}
             #admin-menu a {line-height:1.7em;}
             #admin-menu a.selected {padding-left: 20px !important; background-position: 2px 40%;}
             a.collapsible {padding-left: 12px; background: url(../images/arrow_expanded.png) no-repeat -3px 40%;}
             a.collapsible.collapsed {background: url(../images/arrow_collapsed.png) no-repeat -5px 40%;}
             a#toggle-completed-versions {color:#999;}
             /***** Tables *****/
             table.list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }
             table.list th {  background-color:#EEEEEE; padding: 4px; white-space:nowrap; }
             table.list td {text-align:center; vertical-align:top; padding-right:10px;}
             table.list td.id { width: 2%; text-align: center;}
             table.list td.name, table.list td.description, table.list td.subject, table.list td.comments, table.list td.roles {text-align: left;}
             table.list td.tick {width:15%}
             table.list td.checkbox { width: 15px; padding: 2px 0 0 0; }
             table.list td.checkbox input {padding:0px;}
             table.list td.buttons { width: 15%; white-space:nowrap; text-align: right; }
             table.list td.buttons a { padding-right: 0.6em; }
             table.list td.reorder {width:15%; white-space:nowrap; text-align:center; }
             table.list caption { text-align: left; padding: 0.5em 0.5em 0.5em 0; }
             tr.project td.name a { white-space:nowrap; }
             tr.project.closed, tr.project.archived { color: #aaa; }
             tr.project.closed a, tr.project.archived a { color: #aaa; }
             tr.project.idnt td.name span {background: url(../images/bullet_arrow_right.png) no-repeat 0 50%; padding-left: 16px;}
             tr.project.idnt-1 td.name {padding-left: 0.5em;}
             tr.project.idnt-2 td.name {padding-left: 2em;}
             tr.project.idnt-3 td.name {padding-left: 3.5em;}
             tr.project.idnt-4 td.name {padding-left: 5em;}
             tr.project.idnt-5 td.name {padding-left: 6.5em;}
             tr.project.idnt-6 td.name {padding-left: 8em;}
             tr.project.idnt-7 td.name {padding-left: 9.5em;}
             tr.project.idnt-8 td.name {padding-left: 11em;}
             tr.project.idnt-9 td.name {padding-left: 12.5em;}
             tr.issue { text-align: center; white-space: nowrap; }
             tr.issue td.subject, tr.issue td.category, td.assigned_to, tr.issue td.string, tr.issue td.text, tr.issue td.relations { white-space: normal; }
             tr.issue td.relations { text-align: left; }
             tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
             tr.issue td.relations span {white-space: nowrap;}
             table.issues td.description {color:#777; font-size:90%; padding:4px 4px 4px 24px; text-align:left; white-space:normal;}
             table.issues td.description pre {white-space:normal;}
             tr.issue.idnt td.subject a {background: url(../images/bullet_arrow_right.png) no-repeat 0 50%; padding-left: 16px;}
             tr.issue.idnt-1 td.subject {padding-left: 0.5em;}
             tr.issue.idnt-2 td.subject {padding-left: 2em;}
             tr.issue.idnt-3 td.subject {padding-left: 3.5em;}
             tr.issue.idnt-4 td.subject {padding-left: 5em;}
             tr.issue.idnt-5 td.subject {padding-left: 6.5em;}
             tr.issue.idnt-6 td.subject {padding-left: 8em;}
             tr.issue.idnt-7 td.subject {padding-left: 9.5em;}
             tr.issue.idnt-8 td.subject {padding-left: 11em;}
             tr.issue.idnt-9 td.subject {padding-left: 12.5em;}
             table.issue-report {table-layout:fixed;}
             tr.entry { border: 1px solid #f8f8f8; }
             tr.entry td { white-space: nowrap; }
             tr.entry td.filename {width:30%; text-align:left;}
             tr.entry td.filename_no_report {width:70%; text-align:left;}
             tr.entry td.size { text-align: right; font-size: 90%; }
             tr.entry td.revision, tr.entry td.author { text-align: center; }
             tr.entry td.age { text-align: right; }
             tr.entry.file td.filename a { margin-left: 16px; }
             tr.entry.file td.filename_no_report a { margin-left: 16px; }
             tr span.expander {background-image: url(../images/bullet_toggle_plus.png); padding-left: 8px; margin-left: 0; cursor: pointer;}
             tr.open span.expander {background-image: url(../images/bullet_toggle_minus.png);}
             tr.changeset { height: 20px }
             tr.changeset ul, ol { margin-top: 0px; margin-bottom: 0px; }
             tr.changeset td.revision_graph { width: 15%; background-color: #fffffb; }
             tr.changeset td.author { text-align: center; width: 15%; white-space:nowrap;}
             tr.changeset td.committed_on { text-align: center; width: 15%; white-space:nowrap;}
             table.files tbody th {text-align:left;}
             table.files tr.file td.filename { text-align: left; padding-left: 24px; }
             table.files tr.file td.digest { font-size: 80%; }
             table.members td.roles, table.memberships td.roles { width: 45%; }
             tr.message { height: 2.6em; }
             tr.message td.subject { padding-left: 20px; }
             tr.message td.created_on { white-space: nowrap; }
             tr.message td.last_message { font-size: 80%; white-space: nowrap; }
             tr.message.locked td.subject { background: url(../images/locked.png) no-repeat 0 1px; }
             tr.message.sticky td.subject { background: url(../images/bullet_go.png) no-repeat 0 1px; font-weight: bold; }
             tr.version.closed, tr.version.closed a { color: #999; }
             tr.version td.name { padding-left: 20px; }
             tr.version.shared td.name { background: url(../images/link.png) no-repeat 0% 70%; }
             tr.version td.date, tr.version td.status, tr.version td.sharing { text-align: center; white-space:nowrap; }
             tr.user td {width:13%;white-space: nowrap;}
             tr.user td.username, tr.user td.firstname, tr.user td.lastname, tr.user td.email {text-align:left;}
             tr.user td.email { width:18%; }
             tr.user.locked, tr.user.registered { color: #aaa; }
             tr.user.locked a, tr.user.registered a { color: #aaa; }
             table.permissions td.role {color:#999;font-size:90%;font-weight:normal !important;text-align:center;vertical-align:bottom;}
             tr.wiki-page-version td.updated_on, tr.wiki-page-version td.author {text-align:center;}
             tr.time-entry { text-align: center; white-space: nowrap; }
             tr.time-entry td.issue, tr.time-entry td.comments { text-align: left; white-space: normal; }
             td.hours { text-align: right; font-weight: bold; padding-right: 0.5em; }
             td.hours .hours-dec { font-size: 0.9em; }
             table.plugins td { vertical-align: middle; }
             table.plugins td.configure { text-align: right; padding-right: 1em; }
             table.plugins span.name { font-weight: bold; display: block; margin-bottom: 6px; }
             table.plugins span.description { display: block; font-size: 0.9em; }
             table.plugins span.url { display: block; font-size: 0.9em; }
             table.list tbody tr.group td { padding: 0.8em 0 0.5em 0.3em; font-weight: bold; border-bottom: 1px solid #ccc; text-align:left; }
             table.list tbody tr.group span.count {position:relative; top:-1px; color:#fff; font-size:10px; background:#9DB9D5; padding:0px 6px 1px 6px; border-radius:3px; margin-left:4px;}
             tr.group a.toggle-all { color: #aaa; font-size: 80%; font-weight: normal; display:none;}
             tr.group:hover a.toggle-all { display:inline;}
             a.toggle-all:hover {text-decoration:none;}
             table.list tbody tr:hover { background-color:#ffffdd; }
             table.list tbody tr.group:hover { background-color:inherit; }
             table td {padding:2px;}
             table p {margin:0;}
             .odd {background-color:#f6f7f8;}
             .even {background-color: #fff;}
             a.sort { padding-right: 16px; background-position: 100% 50%; background-repeat: no-repeat; }
             a.sort.asc  { background-image: url(../images/sort_asc.png); }
             a.sort.desc { background-image: url(../images/sort_desc.png); }
             table.attributes { width: 100% }
             table.attributes th { vertical-align: top; text-align: left; }
             table.attributes td { vertical-align: top; }
             table.boards a.board, h3.comments { background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 20px; }
             table.boards td.last-message {text-align:left;font-size:80%;}
             table.messages td.last_message {text-align:left;}
+            #query_form_content {font-size:90%;}
             table.query-columns {
               border-collapse: collapse;
               border: 0;
             }
             table.query-columns td.buttons {
               vertical-align: middle;
               text-align: center;
             }
             td.center {text-align:center;}
             h3.version { background: url(../images/package.png) no-repeat 0% 50%; padding-left: 20px; }
             div.issues h3 { background: url(../images/ticket.png) no-repeat 0% 50%; padding-left: 20px; }
             div.members h3 { background: url(../images/group.png) no-repeat 0% 50%; padding-left: 20px; }
             div.news h3 { background: url(../images/news.png) no-repeat 0% 50%; padding-left: 20px; }
             div.projects h3 { background: url(../images/projects.png) no-repeat 0% 50%; padding-left: 20px; }
             #watchers select {width: 95%; display: block;}
             #watchers a.delete {opacity: 0.4; vertical-align: middle;}
             #watchers a.delete:hover {opacity: 1;}
             #watchers img.gravatar {margin: 0 4px 2px 0;}
             span#watchers_inputs {overflow:auto; display:block;}
             span.search_for_watchers {display:block;}
             span.search_for_watchers, span.add_attachment {font-size:80%; line-height:2.5em;}
             span.search_for_watchers a, span.add_attachment a {padding-left:16px; background: url(../images/bullet_add.png) no-repeat 0 50%; }
             .highlight { background-color: #FCFD8D;}
             .highlight.token-1 { background-color: #faa;}
             .highlight.token-2 { background-color: #afa;}
             .highlight.token-3 { background-color: #aaf;}
             .box{
               padding:6px;
               margin-bottom: 10px;
               background-color:#f6f6f6;
               color:#505050;
               line-height:1.5em;
               border: 1px solid #e4e4e4;
             }
             div.square {
               border: 1px solid #999;
               float: left;
               margin: .3em .4em 0 .4em;
               overflow: hidden;
               width: .6em; height: .6em;
             }
             .contextual {float:right; white-space: nowrap; line-height:1.4em;margin-top:5px; padding-left: 10px; font-size:0.9em;}
             .contextual input, .contextual select {font-size:0.9em;}
             .message .contextual { margin-top: 0; }
             .splitcontent {overflow:auto;}
             .splitcontentleft{float:left; width:49%;}
             .splitcontentright{float:right; width:49%;}
             form {display: inline;}
             input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;}
             fieldset {border: 1px solid #e4e4e4; margin:0;}
             legend {color: #484848;}
             hr { width: 100%; height: 1px; background: #ccc; border: 0;}
             blockquote { font-style: italic; border-left: 3px solid #e0e0e0; padding-left: 0.6em; margin-left: 2.4em;}
             blockquote blockquote { margin-left: 0;}
             abbr  { border-bottom: 1px dotted; cursor: help; }
             textarea.wiki-edit {width:99%; resize:vertical;}
             li p {margin-top: 0;}
             div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
             p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;}
             p.subtitle { font-size: 0.9em; margin: -6px 0 12px 0; font-style: italic; }
             p.footnote { font-size: 0.9em; margin-top: 0px; margin-bottom: 0px; }
             div.issue div.subject div div { padding-left: 16px; }
             div.issue div.subject p {margin: 0; margin-bottom: 0.1em; font-size: 90%; color: #999;}
             div.issue div.subject>div>p { margin-top: 0.5em; }
             div.issue div.subject h3 {margin: 0; margin-bottom: 0.1em;}
             div.issue span.private { position:relative; bottom: 2px; text-transform: uppercase; background: #d22; color: #fff; font-weight:bold; padding: 0px 2px 0px 2px; font-size: 60%; margin-right: 2px; border-radius: 2px;}
             div.issue .next-prev-links {color:#999;}
             div.issue table.attributes th {width:22%;}
             div.issue table.attributes td {width:28%;}
             #issue_tree table.issues, #relations table.issues { border: 0; }
             #issue_tree td.checkbox, #relations td.checkbox {display:none;}
             #relations td.buttons {padding:0;}
-            fieldset.collapsible { border-width: 1px 0 0 0; font-size: 0.9em; }
+            fieldset.collapsible {border-width: 1px 0 0 0;}
             fieldset.collapsible>legend { padding-left: 16px; background: url(../images/arrow_expanded.png) no-repeat 0% 40%; cursor:pointer; }
             fieldset.collapsible.collapsed>legend { background-image: url(../images/arrow_collapsed.png); }
             fieldset#date-range p { margin: 2px 0 2px 0; }
             fieldset#filters table { border-collapse: collapse; }
             fieldset#filters table td { padding: 0; vertical-align: middle; }
             fieldset#filters tr.filter { height: 2.1em; }
             fieldset#filters td.field { width:230px; }
             fieldset#filters td.operator { width:180px; }
             fieldset#filters td.operator select {max-width:170px;}
             fieldset#filters td.values { white-space:nowrap; }
             fieldset#filters td.values select {min-width:130px;}
             fieldset#filters td.values input {height:1em;}
             fieldset#filters td.add-filter { text-align: right; vertical-align: top; }
             .toggle-multiselect {background: url(../images/bullet_toggle_plus.png) no-repeat 0% 40%; padding-left:8px; margin-left:0; cursor:pointer;}
             .buttons { font-size: 0.9em; margin-bottom: 1.4em; margin-top: 1em; }
             div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}
             div#issue-changesets div.changeset { padding: 4px;}
             div#issue-changesets div.changeset { border-bottom: 1px solid #ddd; }
             div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
             .journal ul.details img {margin:0 0 -3px 4px;}
             div.journal {overflow:auto;}
             div.journal.private-notes {border-left:2px solid #d22; padding-left:4px; margin-left:-6px;}
             div#activity dl, #search-results { margin-left: 2em; }
             div#activity dd, #search-results dd { margin-bottom: 1em; padding-left: 18px; font-size: 0.9em; }
             div#activity dt, #search-results dt { margin-bottom: 0px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
             div#activity dt.me .time { border-bottom: 1px solid #999; }
             div#activity dt .time { color: #777; font-size: 80%; }
             div#activity dd .description, #search-results dd .description { font-style: italic; }
             div#activity span.project:after, #search-results span.project:after { content: " -"; }
             div#activity dd span.description, #search-results dd span.description { display:block; color: #808080; }
             div#activity dt.grouped {margin-left:5em;}
             div#activity dd.grouped {margin-left:9em;}
             #search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px; }
             div#search-results-counts {float:right;}
             div#search-results-counts ul { margin-top: 0.5em; }
             div#search-results-counts  li { list-style-type:none; float: left; margin-left: 1em; }
             dt.issue { background-image: url(../images/ticket.png); }
             dt.issue-edit { background-image: url(../images/ticket_edit.png); }
             dt.issue-closed { background-image: url(../images/ticket_checked.png); }
             dt.issue-note { background-image: url(../images/ticket_note.png); }
             dt.changeset { background-image: url(../images/changeset.png); }
             dt.news { background-image: url(../images/news.png); }
             dt.message { background-image: url(../images/message.png); }
             dt.reply { background-image: url(../images/comments.png); }
             dt.wiki-page { background-image: url(../images/wiki_edit.png); }
             dt.attachment { background-image: url(../images/attachment.png); }
             dt.document { background-image: url(../images/document.png); }
             dt.project { background-image: url(../images/projects.png); }
             dt.time-entry { background-image: url(../images/time.png); }
             #search-results dt.issue.closed { background-image: url(../images/ticket_checked.png); }
             div#roadmap .related-issues { margin-bottom: 1em; }
             div#roadmap .related-issues td.checkbox { display: none; }
             div#roadmap .wiki h1:first-child { display: none; }
             div#roadmap .wiki h1 { font-size: 120%; }
             div#roadmap .wiki h2 { font-size: 110%; }
             body.controller-versions.action-show div#roadmap .related-issues {width:70%;}
             div#version-summary { float:right; width:28%; margin-left: 16px; margin-bottom: 16px; background-color: #fff; }
             div#version-summary fieldset { margin-bottom: 1em; }
             div#version-summary fieldset.time-tracking table { width:100%; }
             div#version-summary th, div#version-summary td.total-hours { text-align: right; }
             table#time-report td.hours, table#time-report th.period, table#time-report th.total { text-align: right; padding-right: 0.5em; }
             table#time-report tbody tr.subtotal { font-style: italic; color:#777;}
             table#time-report tbody tr.subtotal td.hours { color:#b0b0b0; }
             table#time-report tbody tr.total { font-weight: bold; background-color:#EEEEEE; border-top:1px solid #e4e4e4;}
             table#time-report .hours-dec { font-size: 0.9em; }
             div.wiki-page .contextual a {opacity: 0.4}
             div.wiki-page .contextual a:hover {opacity: 1}
             form .attributes select { width: 60%; }
             input#issue_subject { width: 99%; }
             select#issue_done_ratio { width: 95px; }
             ul.projects {margin:0; padding-left:1em;}
             ul.projects ul {padding-left:1.6em;}
             ul.projects.root {margin:0; padding:0;}
             ul.projects li {list-style-type:none;}
             #projects-index ul.projects ul.projects { border-left: 3px solid #e0e0e0; padding-left:1em;}
             #projects-index ul.projects li.root {margin-bottom: 1em;}
             #projects-index ul.projects li.child {margin-top: 1em;}
             #projects-index ul.projects div.root a.project { font-family: "Trebuchet MS", Verdana, sans-serif; font-weight: bold; font-size: 16px; margin: 0 0 10px 0; }
             .my-project { padding-left: 18px; background: url(../images/fav.png) no-repeat 0 50%; }
             #notified-projects>ul, #tracker_project_ids>ul, #custom_field_project_ids>ul {max-height:250px; overflow-y:auto;}
             #related-issues li img {vertical-align:middle;}
             ul.properties {padding:0; font-size: 0.9em; color: #777;}
             ul.properties li {list-style-type:none;}
             ul.properties li span {font-style:italic;}
             .total-hours { font-size: 110%; font-weight: bold; }
             .total-hours span.hours-int { font-size: 120%; }
             .autoscroll {overflow-x: auto; padding:1px; margin-bottom: 1.2em;}
             #user_login, #user_firstname, #user_lastname, #user_mail, #my_account_form select, #user_form select, #user_identity_url { width: 90%; }
             #workflow_copy_form select { width: 200px; }
             table.transitions td.enabled {background: #bfb;}
-            table.fields_permissions select {font-size:90%}
+            #workflow_form table select {font-size:90%; max-width:100px;}
             table.fields_permissions td.readonly {background:#ddd;}
             table.fields_permissions td.required {background:#d88;}
+            select.expandable {vertical-align:top;}
             textarea#custom_field_possible_values {width: 95%; resize:vertical}
             textarea#custom_field_default_value {width: 95%; resize:vertical}
             input#content_comments {width: 99%}
             p.pagination {margin-top:8px; font-size: 90%}
             /***** Tabular forms ******/
             .tabular p{
               margin: 0;
               padding: 3px 0 3px 0;
               padding-left: 180px; /* width of left column containing the label elements */
               min-height: 1.8em;
               clear:left;
             }
             html>body .tabular p {overflow:hidden;}
             .tabular input, .tabular select {max-width:95%}
             .tabular textarea {width:95%; resize:vertical;}
             .tabular span[title] {border-bottom:1px dotted #aaa;}
             .tabular label{
               font-weight: bold;
               float: left;
               text-align: right;
               /* width of left column */
               margin-left: -180px;
               /* width of labels. Should be smaller than left column to create some right margin */
               width: 175px;
             }
             .tabular label.floating{
               font-weight: normal;
               margin-left: 0px;
               text-align: left;
               width: 270px;
             }
             .tabular label.block{
               font-weight: normal;
               margin-left: 0px !important;
               text-align: left;
               float: none;
               display: block;
               width: auto !important;
             }
             .tabular label.inline{
               font-weight: normal;
               float:none;
               margin-left: 5px !important;
               width: auto;
             }
             label.no-css {
               font-weight: inherit;
               float:none;
               text-align:left;
               margin-left:0px;
               width:auto;
             }
             input#time_entry_comments { width: 90%;}
             #preview fieldset {margin-top: 1em; background: url(../images/draft.png)}
             .tabular.settings p{ padding-left: 300px; }
             .tabular.settings label{ margin-left: -300px; width: 295px; }
             .tabular.settings textarea { width: 99%; }
             .settings.enabled_scm table {width:100%}
             .settings.enabled_scm td.scm_name{ font-weight: bold; }
             fieldset.settings label { display: block; }
             fieldset#notified_events .parent { padding-left: 20px; }
             span.required {color: #bb0000;}
             .summary {font-style: italic;}
             .check_box_group {
               display:block;
               width:95%;
               max-height:300px;
               overflow-y:auto;
               padding:2px 4px 4px 2px;
               background:#fff;
               border:1px solid #9EB1C2;
               border-radius:2px
             }
             .check_box_group label {
               font-weight: normal;
               margin-left: 0px !important;
               text-align: left;
               float: none;
               display: block;
               width: auto;
             }
             .check_box_group.bool_cf {border:0; background:inherit;}
             .check_box_group.bool_cf label {display: inline;}
             #attachments_fields input.description {margin-left:4px; width:340px;}
             #attachments_fields span {display:block; white-space:nowrap;}
             #attachments_fields input.filename {border:0; height:1.8em; width:250px; color:#555; background-color:inherit; background:url(../images/attachment.png) no-repeat 1px 50%; padding-left:18px;}
             #attachments_fields .ajax-waiting input.filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
             #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
             #attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
             a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block; padding-left:16px;}
             a.remove-upload:hover {text-decoration:none !important;}
             div.fileover { background-color: lavender; }
             div.attachments { margin-top: 12px; }
             div.attachments p { margin:4px 0 2px 0; }
             div.attachments img { vertical-align: middle; }
             div.attachments span.author { font-size: 0.9em; color: #888; }
             div.thumbnails {margin-top:0.6em;}
             div.thumbnails div {background:#fff;border:2px solid #ddd;display:inline-block;margin-right:2px;}
             div.thumbnails img {margin: 3px;}
             p.other-formats { text-align: right; font-size:0.9em; color: #666; }
             .other-formats span + span:before { content: "| "; }
             a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; }
             em.info {font-style:normal;font-size:90%;color:#888;display:block;}
             em.info.error {padding-left:20px; background:url(../images/exclamation.png) no-repeat 0 50%;}
             textarea.text_cf {width:95%; resize:vertical;}
             input.string_cf, input.link_cf {width:95%;}
             select.bool_cf {width:auto !important;}
             #tab-content-modules fieldset p {margin:3px 0 4px 0;}
             #tab-content-members .splitcontentleft, #tab-content-memberships .splitcontentleft, #tab-content-users .splitcontentleft {width: 64%;}
             #tab-content-members .splitcontentright, #tab-content-memberships .splitcontentright, #tab-content-users .splitcontentright {width: 34%;}
             #tab-content-members fieldset, #tab-content-memberships fieldset, #tab-content-users fieldset {padding:1em; margin-bottom: 1em;}
             #tab-content-members fieldset legend, #tab-content-memberships fieldset legend, #tab-content-users fieldset legend {font-weight: bold;}
             #tab-content-members fieldset label, #tab-content-memberships fieldset label, #tab-content-users fieldset label {display: block;}
             #tab-content-members #principals, #tab-content-users #principals {max-height: 400px; overflow: auto;}
             #tab-content-memberships .splitcontentright select {width:90%}
             #users_for_watcher {height: 200px; overflow:auto;}
             #users_for_watcher label {display: block;}
             table.members td.group { padding-left: 20px; background: url(../images/group.png) no-repeat 0% 50%; }
             input#principal_search, input#user_search {width:90%}
             input.autocomplete {
               background: #fff url(../images/magnifier.png) no-repeat 2px 50%; padding-left:20px !important;
               border:1px solid #9EB1C2; border-radius:2px; height:1.5em;
             }
             input.autocomplete.ajax-loading {
               background-image: url(../images/loading.gif);
             }
             .role-visibility {padding-left:2em;}
             /***** Flash & error messages ****/
             #errorExplanation, div.flash, .nodata, .warning, .conflict {
               padding: 4px 4px 4px 30px;
               margin-bottom: 12px;
               font-size: 1.1em;
               border: 2px solid;
             }
             div.flash {margin-top: 8px;}
             div.flash.error, #errorExplanation {
               background: url(../images/exclamation.png) 8px 50% no-repeat;
               background-color: #ffe3e3;
               border-color: #dd0000;
               color: #880000;
             }
             div.flash.notice {
               background: url(../images/true.png) 8px 5px no-repeat;
               background-color: #dfffdf;
               border-color: #9fcf9f;
               color: #005f00;
             }
             div.flash.warning, .conflict {
               background: url(../images/warning.png) 8px 5px no-repeat;
               background-color: #FFEBC1;
               border-color: #FDBF3B;
               color: #A6750C;
               text-align: left;
             }
             .nodata, .warning {
               text-align: center;
               background-color: #FFEBC1;
               border-color: #FDBF3B;
               color: #A6750C;
             }
             #errorExplanation ul { font-size: 0.9em;}
             #errorExplanation h2, #errorExplanation p { display: none; }
             .conflict-details {font-size:80%;}
             /***** Ajax indicator ******/
             #ajax-indicator {
             position: absolute; /* fixed not supported by IE */
             background-color:#eee;
             border: 1px solid #bbb;
             top:35%;
             left:40%;
             width:20%;
             font-weight:bold;
             text-align:center;
             padding:0.6em;
             z-index:100;
             opacity: 0.5;
             }
             html>body #ajax-indicator { position: fixed; }
             #ajax-indicator span {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             background-image: url(../images/loading.gif);
             padding-left: 26px;
             vertical-align: bottom;
             }
             /***** Calendar *****/
             table.cal {border-collapse: collapse; width: 100%; margin: 0px 0 6px 0;border: 1px solid #d7d7d7;}
             table.cal thead th {width: 14%; background-color:#EEEEEE; padding: 4px; }
             table.cal thead th.week-number {width: auto;}
             table.cal tbody tr {height: 100px;}
             table.cal td {border: 1px solid #d7d7d7; vertical-align: top; font-size: 0.9em;}
             table.cal td.week-number { background-color:#EEEEEE; padding: 4px; border:none; font-size: 1em;}
             table.cal td p.day-num {font-size: 1.1em; text-align:right;}
             table.cal td.odd p.day-num {color: #bbb;}
             table.cal td.today {background:#ffffdd;}
             table.cal td.today p.day-num {font-weight: bold;}
             table.cal .starting a, p.cal.legend .starting {background: url(../images/bullet_go.png) no-repeat -1px -2px; padding-left:16px;}
             table.cal .ending a, p.cal.legend .ending {background: url(../images/bullet_end.png) no-repeat -1px -2px; padding-left:16px;}
             table.cal .starting.ending a, p.cal.legend .starting.ending {background: url(../images/bullet_diamond.png) no-repeat -1px -2px; padding-left:16px;}
             p.cal.legend span {display:block;}
             /***** Tooltips ******/
             .tooltip{position:relative;z-index:24;}
             .tooltip:hover{z-index:25;color:#000;}
             .tooltip span.tip{display: none; text-align:left;}
             div.tooltip:hover span.tip{
             display:block;
             position:absolute;
             top:12px; left:24px; width:270px;
             border:1px solid #555;
             background-color:#fff;
             padding: 4px;
             font-size: 0.8em;
             color:#505050;
             }
             img.ui-datepicker-trigger {
               cursor: pointer;
               vertical-align: middle;
               margin-left: 4px;
             }
             /***** Progress bar *****/
             table.progress {
               border-collapse: collapse;
               border-spacing: 0pt;
               empty-cells: show;
               text-align: center;
               float:left;
               margin: 1px 6px 1px 0px;
             }
             table.progress td { height: 1em; }
             table.progress td.closed { background: #BAE0BA none repeat scroll 0%; }
             table.progress td.done { background: #D3EDD3 none repeat scroll 0%; }
             table.progress td.todo { background: #eee none repeat scroll 0%; }
             p.percent {font-size: 80%;}
             p.progress-info {clear: left; font-size: 80%; margin-top:-4px; color:#777;}
             #roadmap table.progress td { height: 1.2em; }
             /***** Tabs *****/
             #content .tabs {height: 2.6em; margin-bottom:1.2em; position:relative; overflow:hidden;}
             #content .tabs ul {margin:0; position:absolute; bottom:0; padding-left:0.5em; width: 2000px; border-bottom: 1px solid #bbbbbb;}
             #content .tabs ul li {
               float:left;
               list-style-type:none;
               white-space:nowrap;
               margin-right:4px;
               background:#fff;
               position:relative;
               margin-bottom:-1px;
             }
             #content .tabs ul li a{
               display:block;
               font-size: 0.9em;
               text-decoration:none;
               line-height:1.3em;
               padding:4px 6px 4px 6px;
               border: 1px solid #ccc;
               border-bottom: 1px solid #bbbbbb;
               background-color: #f6f6f6;
               color:#999;
               font-weight:bold;
               border-top-left-radius:3px;
               border-top-right-radius:3px;
             }
             #content .tabs ul li a:hover {
               background-color: #ffffdd;
               text-decoration:none;
             }
             #content .tabs ul li a.selected {
               background-color: #fff;
               border: 1px solid #bbbbbb;
               border-bottom: 1px solid #fff;
               color:#444;
             }
             #content .tabs ul li a.selected:hover {background-color: #fff;}
             div.tabs-buttons { position:absolute; right: 0; width: 48px; height: 24px; background: white; bottom: 0; border-bottom: 1px solid #bbbbbb; }
             button.tab-left, button.tab-right {
               font-size: 0.9em;
               cursor: pointer;
               height:24px;
               border: 1px solid #ccc;
               border-bottom: 1px solid #bbbbbb;
               position:absolute;
               padding:4px;
               width: 20px;
               bottom: -1px;
             }
             button.tab-left {
               right: 20px;
               background: #eeeeee url(../images/bullet_arrow_left.png) no-repeat 50% 50%;
               border-top-left-radius:3px;
             }
             button.tab-right {
               right: 0;
               background: #eeeeee url(../images/bullet_arrow_right.png) no-repeat 50% 50%;
               border-top-right-radius:3px;
             }
             /***** Diff *****/
             .diff_out { background: #fcc; }
             .diff_out span { background: #faa; }
             .diff_in { background: #cfc; }
             .diff_in span { background: #afa; }
             .text-diff {
               padding: 1em;
               background-color:#f6f6f6;
               color:#505050;
               border: 1px solid #e4e4e4;
             }
             /***** Wiki *****/
             div.wiki table {
               border-collapse: collapse;
               margin-bottom: 1em;
             }
             div.wiki table, div.wiki td, div.wiki th {
               border: 1px solid #bbb;
               padding: 4px;
             }
             div.wiki .noborder, div.wiki .noborder td, div.wiki .noborder th {border:0;}
             div.wiki .external {
               background-position: 0% 60%;
               background-repeat: no-repeat;
               padding-left: 12px;
               background-image: url(../images/external.png);
             }
             div.wiki a.new {color: #b73535;}
             div.wiki ul, div.wiki ol {margin-bottom:1em;}
             div.wiki pre {
               margin: 1em 1em 1em 1.6em;
               padding: 8px;
               background-color: #fafafa;
               border: 1px solid #e2e2e2;
               width:auto;
               overflow-x: auto;
               overflow-y: hidden;
             }
             div.wiki ul.toc {
               background-color: #ffffdd;
               border: 1px solid #e4e4e4;
               padding: 4px;
               line-height: 1.2em;
               margin-bottom: 12px;
               margin-right: 12px;
               margin-left: 0;
               display: table
             }
             * html div.wiki ul.toc { width: 50%; } /* IE6 doesn't autosize div */
             div.wiki ul.toc.right { float: right; margin-left: 12px; margin-right: 0; width: auto; }
             div.wiki ul.toc.left  { float: left; margin-right: 12px; margin-left: 0; width: auto; }
             div.wiki ul.toc ul { margin: 0; padding: 0; }
             div.wiki ul.toc li {list-style-type:none; margin: 0; font-size:12px;}
             div.wiki ul.toc li li {margin-left: 1.5em; font-size:10px;}
             div.wiki ul.toc a {
               font-size: 0.9em;
               font-weight: normal;
               text-decoration: none;
               color: #606060;
             }
             div.wiki ul.toc a:hover { color: #c61a1a; text-decoration: underline;}
             a.wiki-anchor { display: none; margin-left: 6px; text-decoration: none; }
             a.wiki-anchor:hover { color: #aaa !important; text-decoration: none; }
             h1:hover a.wiki-anchor, h2:hover a.wiki-anchor, h3:hover a.wiki-anchor { display: inline; color: #ddd; }
             div.wiki img {vertical-align:middle; max-width:100%;}
             /***** My page layout *****/
             .block-receiver {
               border:1px dashed #c0c0c0;
               margin-bottom: 20px;
               padding: 15px 0 15px 0;
             }
             .mypage-box {
               margin:0 0 20px 0;
               color:#505050;
               line-height:1.5em;
             }
             .handle {cursor: move;}
             a.close-icon {
               display:block;
               margin-top:3px;
               overflow:hidden;
               width:12px;
               height:12px;
               background-repeat: no-repeat;
               cursor:pointer;
               background-image:url('../images/close.png');
             }
             a.close-icon:hover {background-image:url('../images/close_hl.png');}
             /***** Gantt chart *****/
             .gantt_hdr {
               position:absolute;
               top:0;
               height:16px;
               border-top: 1px solid #c0c0c0;
               border-bottom: 1px solid #c0c0c0;
               border-right: 1px solid #c0c0c0;
               text-align: center;
               overflow: hidden;
             }
             .gantt_hdr.nwday {background-color:#f1f1f1;}
             .gantt_subjects { font-size: 0.8em; }
             .gantt_subjects div { line-height:16px;height:16px;overflow:hidden;white-space:nowrap;text-overflow: ellipsis; }
             .task {
               position: absolute;
               height:8px;
               font-size:0.8em;
               color:#888;
               padding:0;
               margin:0;
               line-height:16px;
               white-space:nowrap;
             }
             .task.label {width:100%;}
             .task.label.project, .task.label.version { font-weight: bold; }
             .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
             .task_done { background:#00c600 url(../images/task_done.png); border: 1px solid #00c600; }
             .task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
             .task_todo.parent { background: #888; border: 1px solid #888; height: 3px;}
             .task_late.parent, .task_done.parent { height: 3px;}
             .task.parent.marker.starting  { position: absolute; background: url(../images/task_parent_end.png) no-repeat 0 0; width: 8px; height: 16px; margin-left: -4px; left: 0px; top: -1px;}
             .task.parent.marker.ending { position: absolute; background: url(../images/task_parent_end.png) no-repeat 0 0; width: 8px; height: 16px; margin-left: -4px; right: 0px; top: -1px;}
             .version.task_late { background:#f66 url(../images/milestone_late.png); border: 1px solid #f66; height: 2px; margin-top: 3px;}
             .version.task_done { background:#00c600 url(../images/milestone_done.png); border: 1px solid #00c600; height: 2px; margin-top: 3px;}
             .version.task_todo { background:#fff url(../images/milestone_todo.png); border: 1px solid #fff; height: 2px; margin-top: 3px;}
             .version.marker { background-image:url(../images/version_marker.png); background-repeat: no-repeat; border: 0; margin-left: -4px; margin-top: 1px; }
             .project.task_late { background:#f66 url(../images/milestone_late.png); border: 1px solid #f66; height: 2px; margin-top: 3px;}
             .project.task_done { background:#00c600 url(../images/milestone_done.png); border: 1px solid #00c600; height: 2px; margin-top: 3px;}
             .project.task_todo { background:#fff url(../images/milestone_todo.png); border: 1px solid #fff; height: 2px; margin-top: 3px;}
             .project.marker { background-image:url(../images/project_marker.png); background-repeat: no-repeat; border: 0; margin-left: -4px; margin-top: 1px; }
             .version-behind-schedule a, .issue-behind-schedule a {color: #f66914;}
             .version-overdue a, .issue-overdue a, .project-overdue a {color: #f00;}
             /***** Icons *****/
             .icon {
               background-position: 0% 50%;
               background-repeat: no-repeat;
               padding-left: 20px;
               padding-top: 2px;
               padding-bottom: 3px;
             }
             .icon-add { background-image: url(../images/add.png); }
             .icon-edit { background-image: url(../images/edit.png); }
             .icon-copy { background-image: url(../images/copy.png); }
             .icon-duplicate { background-image: url(../images/duplicate.png); }
             .icon-del { background-image: url(../images/delete.png); }
             .icon-move { background-image: url(../images/move.png); }
             .icon-save { background-image: url(../images/save.png); }
             .icon-cancel { background-image: url(../images/cancel.png); }
             .icon-multiple { background-image: url(../images/table_multiple.png); }
             .icon-folder { background-image: url(../images/folder.png); }
             .open .icon-folder { background-image: url(../images/folder_open.png); }
             .icon-package { background-image: url(../images/package.png); }
             .icon-user { background-image: url(../images/user.png); }
             .icon-projects { background-image: url(../images/projects.png); }
             .icon-help { background-image: url(../images/help.png); }
             .icon-attachment  { background-image: url(../images/attachment.png); }
             .icon-history  { background-image: url(../images/history.png); }
             .icon-time  { background-image: url(../images/time.png); }
             .icon-time-add  { background-image: url(../images/time_add.png); }
             .icon-stats  { background-image: url(../images/stats.png); }
             .icon-warning  { background-image: url(../images/warning.png); }
             .icon-fav  { background-image: url(../images/fav.png); }
             .icon-fav-off  { background-image: url(../images/fav_off.png); }
             .icon-reload  { background-image: url(../images/reload.png); }
             .icon-lock  { background-image: url(../images/locked.png); }
             .icon-unlock  { background-image: url(../images/unlock.png); }
             .icon-checked  { background-image: url(../images/true.png); }
             .icon-details  { background-image: url(../images/zoom_in.png); }
             .icon-report  { background-image: url(../images/report.png); }
             .icon-comment  { background-image: url(../images/comment.png); }
             .icon-summary  { background-image: url(../images/lightning.png); }
             .icon-server-authentication { background-image: url(../images/server_key.png); }
             .icon-issue { background-image: url(../images/ticket.png); }
             .icon-zoom-in { background-image: url(../images/zoom_in.png); }
             .icon-zoom-out { background-image: url(../images/zoom_out.png); }
             .icon-passwd { background-image: url(../images/textfield_key.png); }
             .icon-test { background-image: url(../images/bullet_go.png); }
             .icon-file { background-image: url(../images/files/default.png); }
             .icon-file.text-plain { background-image: url(../images/files/text.png); }
             .icon-file.text-x-c { background-image: url(../images/files/c.png); }
             .icon-file.text-x-csharp { background-image: url(../images/files/csharp.png); }
             .icon-file.text-x-java { background-image: url(../images/files/java.png); }
             .icon-file.text-x-javascript { background-image: url(../images/files/js.png); }
             .icon-file.text-x-php { background-image: url(../images/files/php.png); }
             .icon-file.text-x-ruby { background-image: url(../images/files/ruby.png); }
             .icon-file.text-xml { background-image: url(../images/files/xml.png); }
             .icon-file.text-css { background-image: url(../images/files/css.png); }
             .icon-file.text-html { background-image: url(../images/files/html.png); }
             .icon-file.image-gif { background-image: url(../images/files/image.png); }
             .icon-file.image-jpeg { background-image: url(../images/files/image.png); }
             .icon-file.image-png { background-image: url(../images/files/image.png); }
             .icon-file.image-tiff { background-image: url(../images/files/image.png); }
             .icon-file.application-pdf { background-image: url(../images/files/pdf.png); }
             .icon-file.application-zip { background-image: url(../images/files/zip.png); }
             .icon-file.application-x-gzip { background-image: url(../images/files/zip.png); }
             img.gravatar {
               padding: 2px;
               border: solid 1px #d5d5d5;
               background: #fff;
               vertical-align: middle;
             }
             div.issue img.gravatar {
               float: left;
               margin: 0 6px 0 0;
               padding: 5px;
             }
             div.issue table img.gravatar {
               height: 14px;
               width: 14px;
               padding: 2px;
               float: left;
               margin: 0 0.5em 0 0;
             }
             h2 img.gravatar {margin: -2px 4px -4px 0;}
             h3 img.gravatar {margin: -4px 4px -4px 0;}
             h4 img.gravatar {margin: -6px 4px -4px 0;}
             td.username img.gravatar {margin: 0 0.5em 0 0; vertical-align: top;}
             #activity dt img.gravatar {float: left; margin: 0 1em 1em 0;}
             /* Used on 12px Gravatar img tags without the icon background */
             .icon-gravatar {float: left; margin-right: 4px;}
             #activity dt, .journal {clear: left;}
             .journal-link {float: right;}
             h2 img { vertical-align:middle; }
             .hascontextmenu { cursor: context-menu; }
             /* Custom JQuery styles */
             .ui-datepicker-title select {width:70px !important; margin-top:-2px !important; margin-right:4px !important;}
             /************* CodeRay styles *************/
             .syntaxhl div {display: inline;}
             .syntaxhl .line-numbers {padding: 2px 4px 2px 4px; background-color: #eee; margin:0px 5px 0px 0px;}
             .syntaxhl .code pre { overflow: auto }
             .syntaxhl .debug { color: white !important; background: blue !important; }
             .syntaxhl .annotation { color:#007 }
             .syntaxhl .attribute-name { color:#b48 }
             .syntaxhl .attribute-value { color:#700 }
             .syntaxhl .binary { color:#509 }
             .syntaxhl .char .content { color:#D20 }
             .syntaxhl .char .delimiter { color:#710 }
             .syntaxhl .char { color:#D20 }
             .syntaxhl .class { color:#258; font-weight:bold }
             .syntaxhl .class-variable { color:#369 }
             .syntaxhl .color { color:#0A0 }
             .syntaxhl .comment { color:#385 }
             .syntaxhl .comment .char { color:#385 }
             .syntaxhl .comment .delimiter { color:#385 }
             .syntaxhl .complex { color:#A08 }
             .syntaxhl .constant { color:#258; font-weight:bold }
             .syntaxhl .decorator { color:#B0B }
             .syntaxhl .definition { color:#099; font-weight:bold }
             .syntaxhl .delimiter { color:black }
             .syntaxhl .directive { color:#088; font-weight:bold }
             .syntaxhl .doc { color:#970 }
             .syntaxhl .doc-string { color:#D42; font-weight:bold }
             .syntaxhl .doctype { color:#34b }
             .syntaxhl .entity { color:#800; font-weight:bold }
             .syntaxhl .error { color:#F00; background-color:#FAA }
             .syntaxhl .escape  { color:#666 }
             .syntaxhl .exception { color:#C00; font-weight:bold }
             .syntaxhl .float { color:#06D }
             .syntaxhl .function { color:#06B; font-weight:bold }
             .syntaxhl .global-variable { color:#d70 }
             .syntaxhl .hex { color:#02b }
             .syntaxhl .imaginary { color:#f00 }
             .syntaxhl .include { color:#B44; font-weight:bold }
             .syntaxhl .inline { background-color: hsla(0,0%,0%,0.07); color: black }
             .syntaxhl .inline-delimiter { font-weight: bold; color: #666 }
             .syntaxhl .instance-variable { color:#33B }
             .syntaxhl .integer  { color:#06D }
             .syntaxhl .key .char { color: #60f }
             .syntaxhl .key .delimiter { color: #404 }
             .syntaxhl .key { color: #606 }
             .syntaxhl .keyword { color:#939; font-weight:bold }
             .syntaxhl .label { color:#970; font-weight:bold }
             .syntaxhl .local-variable { color:#963 }
             .syntaxhl .namespace { color:#707; font-weight:bold }
             .syntaxhl .octal { color:#40E }
             .syntaxhl .operator { }
             .syntaxhl .predefined { color:#369; font-weight:bold }
             .syntaxhl .predefined-constant { color:#069 }
             .syntaxhl .predefined-type { color:#0a5; font-weight:bold }
             .syntaxhl .preprocessor { color:#579 }
             .syntaxhl .pseudo-class { color:#00C; font-weight:bold }
             .syntaxhl .regexp .content { color:#808 }
             .syntaxhl .regexp .delimiter { color:#404 }
             .syntaxhl .regexp .modifier { color:#C2C }
             .syntaxhl .regexp { background-color:hsla(300,100%,50%,0.06); }
             .syntaxhl .reserved { color:#080; font-weight:bold }
             .syntaxhl .shell .content { color:#2B2 }
             .syntaxhl .shell .delimiter { color:#161 }
             .syntaxhl .shell { background-color:hsla(120,100%,50%,0.06); }
             .syntaxhl .string .char { color: #46a }
             .syntaxhl .string .content { color: #46a }
             .syntaxhl .string .delimiter { color: #46a }
             .syntaxhl .string .modifier { color: #46a }
             .syntaxhl .symbol .content { color:#d33 }
             .syntaxhl .symbol .delimiter { color:#d33 }
             .syntaxhl .symbol { color:#d33 }
             .syntaxhl .tag { color:#070 }
             .syntaxhl .type { color:#339; font-weight:bold }
             .syntaxhl .value { color: #088; }
             .syntaxhl .variable  { color:#037 }
             .syntaxhl .insert { background: hsla(120,100%,50%,0.12) }
             .syntaxhl .delete { background: hsla(0,100%,50%,0.12) }
             .syntaxhl .change { color: #bbf; background: #007; }
             .syntaxhl .head { color: #f8f; background: #505 }
             .syntaxhl .head .filename { color: white; }
             .syntaxhl .delete .eyecatcher { background-color: hsla(0,100%,50%,0.2); border: 1px solid hsla(0,100%,45%,0.5); margin: -1px; border-bottom: none; border-top-left-radius: 5px; border-top-right-radius: 5px; }
             .syntaxhl .insert .eyecatcher { background-color: hsla(120,100%,50%,0.2); border: 1px solid hsla(120,100%,25%,0.5); margin: -1px; border-top: none; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; }
             .syntaxhl .insert .insert { color: #0c0; background:transparent; font-weight:bold }
             .syntaxhl .delete .delete { color: #c00; background:transparent; font-weight:bold }
             .syntaxhl .change .change { color: #88f }
             .syntaxhl .head .head { color: #f4f }
             /***** Media print specific styles *****/
             @media print {
               #top-menu, #header, #main-menu, #sidebar, #footer, .contextual, .other-formats { display:none; }
               #main { background: #fff; }
               #content { width: 99%; margin: 0; padding: 0; border: 0; background: #fff; overflow: visible !important;}
               #wiki_add_attachment { display:none; }
               .hide-when-print { display: none; }
               .autoscroll {overflow-x: visible;}
               table.list {margin-top:0.5em;}
               table.list th, table.list td {border: 1px solid #aaa;}
             }
             /* Accessibility specific styles */
             .hidden-for-sighted {
               position:absolute;
               left:-10000px;
               top:auto;
               width:1px;
               height:1px;
               overflow:hidden;
             }

test/functional/workflows_controller_test.rb +73 -63

             # Redmine - project management software
             # Copyright (C) 2006-2014  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class WorkflowsControllerTest < ActionController::TestCase
               fixtures :roles, :trackers, :workflows, :users, :issue_statuses
               def setup
                 User.current = nil
                 @request.session[:user_id] = 1 # admin
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'index'
                 count = WorkflowTransition.where(:role_id => 1, :tracker_id => 2).count
                 assert_tag :tag => 'a', :content => count.to_s,
                                         :attributes => { :href => '/workflows/edit?role_id=1&amp;tracker_id=2' }
               end
               def test_get_edit
                 get :edit
                 assert_response :success
                 assert_template 'edit'
-                assert_not_nil assigns(:roles)
-                assert_not_nil assigns(:trackers)
               end
               def test_get_edit_with_role_and_tracker
                 WorkflowTransition.delete_all
                 WorkflowTransition.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 2, :new_status_id => 3)
                 WorkflowTransition.create!(:role_id => 2, :tracker_id => 1, :old_status_id => 3, :new_status_id => 5)
                 get :edit, :role_id => 2, :tracker_id => 1
                 assert_response :success
                 assert_template 'edit'
                 # used status only
                 assert_not_nil assigns(:statuses)
                 assert_equal [2, 3, 5], assigns(:statuses).collect(&:id)
                 # allowed transitions
-                assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                assert_select 'input[type=checkbox][name=?][value=1][checked=checked]', 'transitions[3][5][always]'
-                                                             :name => 'issue_status[3][5][]',
-                                                             :value => 'always',
-                                                             :checked => 'checked' }
                 # not allowed
-                assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                assert_select 'input[type=checkbox][name=?][value=1]:not([checked=checked])', 'transitions[3][2][always]'
-                                                             :name => 'issue_status[3][2][]',
-                                                             :value => 'always',
-                                                             :checked => nil }
                 # unused
-                assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                assert_select 'input[type=checkbox][name=?]', 'transitions[1][1][always]', 0
-                                                                :name => 'issue_status[1][1][]' }
               end
               def test_get_edit_with_role_and_tracker_and_all_statuses
                 WorkflowTransition.delete_all
                 get :edit, :role_id => 2, :tracker_id => 1, :used_statuses_only => '0'
                 assert_response :success
                 assert_template 'edit'
                 assert_not_nil assigns(:statuses)
                 assert_equal IssueStatus.count, assigns(:statuses).size
-                assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                assert_select 'input[type=checkbox][name=?]', 'transitions[1][1][always]'
-                                                             :name => 'issue_status[1][1][]',
-                                                             :value => 'always',
-                                                             :checked => nil }
               end
               def test_post_edit
+                WorkflowTransition.delete_all
                 post :edit, :role_id => 2, :tracker_id => 1,
-                  :issue_status => {
+                  :transitions => {
-                    '4' => {'5' => ['always']},
+                    '4' => {'5' => {'always' => '1'}},
-                    '3' => {'1' => ['always'], '2' => ['always']}
+                    '3' => {'1' => {'always' => '1'}, '2' => {'always' => '1'}}
                   }
-                assert_redirected_to '/workflows/edit?role_id=2&tracker_id=1'
+                assert_response 302
                 assert_equal 3, WorkflowTransition.where(:tracker_id => 1, :role_id => 2).count
                 assert_not_nil  WorkflowTransition.where(:role_id => 2, :tracker_id => 1, :old_status_id => 3, :new_status_id => 2).first
                 assert_nil      WorkflowTransition.where(:role_id => 2, :tracker_id => 1, :old_status_id => 5, :new_status_id => 4).first
               end
               def test_post_edit_with_additional_transitions
+                WorkflowTransition.delete_all
                 post :edit, :role_id => 2, :tracker_id => 1,
-                  :issue_status => {
+                  :transitions => {
-                    '4' => {'5' => ['always']},
+                    '4' => {'5' => {'always' => '1', 'author' => '0', 'assignee' => '0'}},
-                    '3' => {'1' => ['author'], '2' => ['assignee'], '4' => ['author', 'assignee']}
+                    '3' => {'1' => {'always' => '0', 'author' => '1', 'assignee' => '0'},
+                            '2' => {'always' => '0', 'author' => '0', 'assignee' => '1'},
+                            '4' => {'always' => '0', 'author' => '1', 'assignee' => '1'}}
                   }
-                assert_redirected_to '/workflows/edit?role_id=2&tracker_id=1'
+                assert_response 302
                 assert_equal 4, WorkflowTransition.where(:tracker_id => 1, :role_id => 2).count
                 w = WorkflowTransition.where(:role_id => 2, :tracker_id => 1, :old_status_id => 4, :new_status_id => 5).first
                 assert ! w.author
                 assert ! w.assignee
                 w = WorkflowTransition.where(:role_id => 2, :tracker_id => 1, :old_status_id => 3, :new_status_id => 1).first
                 assert w.author
                 assert ! w.assignee
                 w = WorkflowTransition.where(:role_id => 2, :tracker_id => 1, :old_status_id => 3, :new_status_id => 2).first
                 assert ! w.author
                 assert w.assignee
                 w = WorkflowTransition.where(:role_id => 2, :tracker_id => 1, :old_status_id => 3, :new_status_id => 4).first
                 assert w.author
                 assert w.assignee
               end
-              def test_clear_workflow
-                assert WorkflowTransition.where(:role_id => 1, :tracker_id => 2).count > 0
-                post :edit, :role_id => 1, :tracker_id => 2
-                assert_equal 0, WorkflowTransition.where(:role_id => 1, :tracker_id => 2).count
-              end
               def test_get_permissions
                 get :permissions
                 assert_response :success
                 assert_template 'permissions'
-                assert_not_nil assigns(:roles)
-                assert_not_nil assigns(:trackers)
               end
               def test_get_permissions_with_role_and_tracker
                 WorkflowPermission.delete_all
                 WorkflowPermission.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 2, :field_name => 'assigned_to_id', :rule => 'required')
                 WorkflowPermission.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 2, :field_name => 'fixed_version_id', :rule => 'required')
                 WorkflowPermission.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 3, :field_name => 'fixed_version_id', :rule => 'readonly')
                 get :permissions, :role_id => 1, :tracker_id => 2
                 assert_response :success
                 assert_template 'permissions'
-                assert_select 'input[name=role_id][value=1]'
+                assert_select 'input[name=?][value=1]', 'role_id[]'
-                assert_select 'input[name=tracker_id][value=2]'
+                assert_select 'input[name=?][value=2]', 'tracker_id[]'
                 # Required field
-                assert_select 'select[name=?]', 'permissions[assigned_to_id][2]' do
+                assert_select 'select[name=?]', 'permissions[2][assigned_to_id]' do
                   assert_select 'option[value=]'
                   assert_select 'option[value=][selected=selected]', 0
                   assert_select 'option[value=readonly]', :text => 'Read-only'
                   assert_select 'option[value=readonly][selected=selected]', 0
                   assert_select 'option[value=required]', :text => 'Required'
                   assert_select 'option[value=required][selected=selected]'
                 end
                 # Read-only field
-                assert_select 'select[name=?]', 'permissions[fixed_version_id][3]' do
+                assert_select 'select[name=?]', 'permissions[3][fixed_version_id]' do
                   assert_select 'option[value=]'
                   assert_select 'option[value=][selected=selected]', 0
                   assert_select 'option[value=readonly]', :text => 'Read-only'
                   assert_select 'option[value=readonly][selected=selected]'
                   assert_select 'option[value=required]', :text => 'Required'
                   assert_select 'option[value=required][selected=selected]', 0
                 end
                 # Other field
-                assert_select 'select[name=?]', 'permissions[due_date][3]' do
+                assert_select 'select[name=?]', 'permissions[3][due_date]' do
                   assert_select 'option[value=]'
                   assert_select 'option[value=][selected=selected]', 0
                   assert_select 'option[value=readonly]', :text => 'Read-only'
                   assert_select 'option[value=readonly][selected=selected]', 0
                   assert_select 'option[value=required]', :text => 'Required'
                   assert_select 'option[value=required][selected=selected]', 0
                 end
               end
               def test_get_permissions_with_required_custom_field_should_not_show_required_option
                 cf = IssueCustomField.create!(:name => 'Foo', :field_format => 'string', :tracker_ids => [1], :is_required => true)
                 get :permissions, :role_id => 1, :tracker_id => 1
                 assert_response :success
                 assert_template 'permissions'
                 # Custom field that is always required
                 # The default option is "(Required)"
-                assert_select 'select[name=?]', "permissions[#{cf.id}][3]" do
+                assert_select 'select[name=?]', "permissions[3][#{cf.id}]" do
                   assert_select 'option[value=]'
                   assert_select 'option[value=readonly]', :text => 'Read-only'
                   assert_select 'option[value=required]', 0
                 end
               end
               def test_get_permissions_should_disable_hidden_custom_fields
                 cf1 = IssueCustomField.generate!(:tracker_ids => [1], :visible => true)
                 cf2 = IssueCustomField.generate!(:tracker_ids => [1], :visible => false, :role_ids => [1])
                 cf3 = IssueCustomField.generate!(:tracker_ids => [1], :visible => false, :role_ids => [1, 2])
                 get :permissions, :role_id => 2, :tracker_id => 1
                 assert_response :success
                 assert_template 'permissions'
-                assert_select 'select[name=?]:not(.disabled)', "permissions[#{cf1.id}][1]"
+                assert_select 'select[name=?]:not(.disabled)', "permissions[1][#{cf1.id}]"
-                assert_select 'select[name=?]:not(.disabled)', "permissions[#{cf3.id}][1]"
+                assert_select 'select[name=?]:not(.disabled)', "permissions[1][#{cf3.id}]"
-                assert_select 'select[name=?][disabled=disabled]', "permissions[#{cf2.id}][1]" do
+                assert_select 'select[name=?][disabled=disabled]', "permissions[1][#{cf2.id}]" do
                   assert_select 'option[value=][selected=selected]', :text => 'Hidden'
                 end
               end
-              def test_get_permissions_with_role_and_tracker_and_all_statuses
+              def test_get_permissions_with_missing_permissions_for_roles_should_default_to_no_change
+                WorkflowPermission.delete_all
+                WorkflowPermission.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 1, :field_name => 'assigned_to_id', :rule => 'required')
+                get :permissions, :role_id => [1, 2], :tracker_id => 2
+                assert_response :success
+                assert_select 'select[name=?]', 'permissions[1][assigned_to_id]' do
+                  assert_select 'option[selected]', 1
+                  assert_select 'option[selected][value=no_change]'
+                end
+              end
+              def test_get_permissions_with_different_permissions_for_roles_should_default_to_no_change
+                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 => 2, :tracker_id => 2, :old_status_id => 1, :field_name => 'assigned_to_id', :rule => 'readonly')
+                get :permissions, :role_id => [1, 2], :tracker_id => 2
+                assert_response :success
+                assert_select 'select[name=?]', 'permissions[1][assigned_to_id]' do
+                  assert_select 'option[selected]', 1
+                  assert_select 'option[selected][value=no_change]'
+                end
+              end
+              def test_get_permissions_with_same_permissions_for_roles_should_default_to_permission
+                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 => 2, :tracker_id => 2, :old_status_id => 1, :field_name => 'assigned_to_id', :rule => 'required')
+                get :permissions, :role_id => [1, 2], :tracker_id => 2
+                assert_response :success
+                assert_select 'select[name=?]', 'permissions[1][assigned_to_id]' do
+                  assert_select 'option[selected]', 1
+                  assert_select 'option[selected][value=required]'
+                end
+              end
+              def test_get_permissions_with_role_and_tracker_and_all_statuses_should_show_all_statuses
                 WorkflowTransition.delete_all
                 get :permissions, :role_id => 1, :tracker_id => 2, :used_statuses_only => '0'
                 assert_response :success
                 assert_equal IssueStatus.sorted.all, assigns(:statuses)
               end
               def test_post_permissions
                 WorkflowPermission.delete_all
                 post :permissions, :role_id => 1, :tracker_id => 2, :permissions => {
-                  'assigned_to_id' => {'1' => '', '2' => 'readonly', '3' => ''},
+                  '1' => {'assigned_to_id' => '', 'fixed_version_id' => 'required', 'due_date' => ''},
-                  'fixed_version_id' => {'1' => 'required', '2' => 'readonly', '3' => ''},
+                  '2' => {'assigned_to_id' => 'readonly', 'fixed_version_id' => 'readonly', 'due_date' => ''},
-                  'due_date' => {'1' => '', '2' => '', '3' => ''},
+                  '3' => {'assigned_to_id' => '',  'fixed_version_id' => '', 'due_date' => ''}
                 }
-                assert_redirected_to '/workflows/permissions?role_id=1&tracker_id=2'
+                assert_response 302
                 workflows = WorkflowPermission.all
                 assert_equal 3, workflows.size
                 workflows.each do |workflow|
                   assert_equal 1, workflow.role_id
                   assert_equal 2, workflow.tracker_id
                 end
                 assert workflows.detect {|wf| wf.old_status_id == 2 && wf.field_name == 'assigned_to_id' && wf.rule == 'readonly'}
                 assert workflows.detect {|wf| wf.old_status_id == 1 && wf.field_name == 'fixed_version_id' && wf.rule == 'required'}
                 assert workflows.detect {|wf| wf.old_status_id == 2 && wf.field_name == 'fixed_version_id' && wf.rule == 'readonly'}
               end
-              def test_post_permissions_should_clear_permissions
-                WorkflowPermission.delete_all
-                WorkflowPermission.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 2, :field_name => 'assigned_to_id', :rule => 'required')
-                WorkflowPermission.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 2, :field_name => 'fixed_version_id', :rule => 'required')
-                wf1 = WorkflowPermission.create!(:role_id => 1, :tracker_id => 3, :old_status_id => 2, :field_name => 'fixed_version_id', :rule => 'required')
-                wf2 = WorkflowPermission.create!(:role_id => 2, :tracker_id => 2, :old_status_id => 3, :field_name => 'fixed_version_id', :rule => 'readonly')
-                post :permissions, :role_id => 1, :tracker_id => 2
-                assert_redirected_to '/workflows/permissions?role_id=1&tracker_id=2'
-                workflows = WorkflowPermission.all
-                assert_equal 2, workflows.size
-                assert wf1.reload
-                assert wf2.reload
-              end
               def test_get_copy
                 get :copy
                 assert_response :success
                 assert_template 'copy'
                 assert_select 'select[name=source_tracker_id]' do
                   assert_select 'option[value=1]', :text => 'Bug'
                 end
                 assert_select 'select[name=source_role_id]' do
                   assert_select 'option[value=2]', :text => 'Developer'
                 end
                 assert_select 'select[name=?]', 'target_tracker_ids[]' do
                   assert_select 'option[value=3]', :text => 'Support request'
                 end
                 assert_select 'select[name=?]', 'target_role_ids[]' do
                   assert_select 'option[value=1]', :text => 'Manager'
                 end
               end
               def test_post_copy_one_to_one
                 source_transitions = status_transitions(:tracker_id => 1, :role_id => 2)
                 post :copy, :source_tracker_id => '1', :source_role_id => '2',
                             :target_tracker_ids => ['3'], :target_role_ids => ['1']
                 assert_response 302
                 assert_equal source_transitions, status_transitions(:tracker_id => 3, :role_id => 1)
               end
               def test_post_copy_one_to_many
                 source_transitions = status_transitions(:tracker_id => 1, :role_id => 2)
                 post :copy, :source_tracker_id => '1', :source_role_id => '2',
                             :target_tracker_ids => ['2', '3'], :target_role_ids => ['1', '3']
                 assert_response 302
                 assert_equal source_transitions, status_transitions(:tracker_id => 2, :role_id => 1)
                 assert_equal source_transitions, status_transitions(:tracker_id => 3, :role_id => 1)
                 assert_equal source_transitions, status_transitions(:tracker_id => 2, :role_id => 3)
                 assert_equal source_transitions, status_transitions(:tracker_id => 3, :role_id => 3)
               end
               def test_post_copy_many_to_many
                 source_t2 = status_transitions(:tracker_id => 2, :role_id => 2)
                 source_t3 = status_transitions(:tracker_id => 3, :role_id => 2)
                 post :copy, :source_tracker_id => 'any', :source_role_id => '2',
                             :target_tracker_ids => ['2', '3'], :target_role_ids => ['1', '3']
                 assert_response 302
                 assert_equal source_t2, status_transitions(:tracker_id => 2, :role_id => 1)
                 assert_equal source_t3, status_transitions(:tracker_id => 3, :role_id => 1)
                 assert_equal source_t2, status_transitions(:tracker_id => 2, :role_id => 3)
                 assert_equal source_t3, status_transitions(:tracker_id => 3, :role_id => 3)
               end
               def test_post_copy_with_incomplete_source_specification_should_fail
                 assert_no_difference 'WorkflowRule.count' do
                   post :copy,
                     :source_tracker_id => '', :source_role_id => '2',
                     :target_tracker_ids => ['2', '3'], :target_role_ids => ['1', '3']
                   assert_response 200
                   assert_select 'div.flash.error', :text => 'Please select a source tracker or role'
                 end
               end
               def test_post_copy_with_incomplete_target_specification_should_fail
                 assert_no_difference 'WorkflowRule.count' do
                   post :copy,
                     :source_tracker_id => '1', :source_role_id => '2',
                     :target_tracker_ids => ['2', '3']
                   assert_response 200
                   assert_select 'div.flash.error', :text => 'Please select target tracker(s) and role(s)'
                 end
               end
               # Returns an array of status transitions that can be compared
               def status_transitions(conditions)
                 WorkflowTransition.
                   where(conditions).
                   order('tracker_id, role_id, old_status_id, new_status_id').
                   collect {|w| [w.old_status, w.new_status_id]}
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages