summaryrefslogtreecommitdiffstats
path: root/app/controllers/workflows_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-15 14:12:17 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-15 14:12:17 +0000
commitd7b669e50b1c863b748231dc8fb66a692a33cdd1 (patch)
tree59001bb1ae7cb03a9c8ce92e8ffb9b874c56f4af /app/controllers/workflows_controller.rb
parent54d55a360a21569b4a76070b52177e778d5521c7 (diff)
downloadredmine-d7b669e50b1c863b748231dc8fb66a692a33cdd1.tar.gz
redmine-d7b669e50b1c863b748231dc8fb66a692a33cdd1.zip
Workflow enhancement: editable and required fields configurable by role, tracker and status (#703, #3521).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9977 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/workflows_controller.rb')
-rw-r--r--app/controllers/workflows_controller.rb42
1 files changed, 36 insertions, 6 deletions
diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb
index c381666a3..3c49de8d5 100644
--- a/app/controllers/workflows_controller.rb
+++ b/app/controllers/workflows_controller.rb
@@ -23,7 +23,7 @@ class WorkflowsController < ApplicationController
before_filter :find_trackers
def index
- @workflow_counts = Workflow.count_by_tracker_and_role
+ @workflow_counts = WorkflowTransition.count_by_tracker_and_role
end
def edit
@@ -31,16 +31,15 @@ class WorkflowsController < ApplicationController
@tracker = Tracker.find_by_id(params[:tracker_id])
if request.post?
- Workflow.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
+ WorkflowTransition.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
(params[:issue_status] || []).each { |status_id, transitions|
transitions.each { |new_status_id, options|
author = options.is_a?(Array) && options.include?('author') && !options.include?('always')
assignee = options.is_a?(Array) && options.include?('assignee') && !options.include?('always')
- @role.workflows.build(:tracker_id => @tracker.id, :old_status_id => status_id, :new_status_id => new_status_id, :author => author, :assignee => assignee)
+ 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 :action => 'edit', :role_id => @role, :tracker_id => @tracker
return
end
@@ -53,7 +52,7 @@ class WorkflowsController < ApplicationController
@statuses ||= IssueStatus.find(:all, :order => 'position')
if @tracker && @role && @statuses.any?
- workflows = Workflow.all(:conditions => {:role_id => @role.id, :tracker_id => @tracker.id})
+ workflows = WorkflowTransition.all(:conditions => {:role_id => @role.id, :tracker_id => @tracker.id})
@workflows = {}
@workflows['always'] = workflows.select {|w| !w.author && !w.assignee}
@workflows['author'] = workflows.select {|w| w.author}
@@ -61,6 +60,37 @@ class WorkflowsController < ApplicationController
end
end
+ def permissions
+ @role = Role.find_by_id(params[:role_id])
+ @tracker = Tracker.find_by_id(params[:tracker_id])
+
+ if @role && @tracker
+ if request.post?
+ WorkflowPermission.destroy_all({:role_id => @role.id, :tracker_id => @tracker.id})
+ (params[:permissions] || {}).each { |field, rule_by_status_id|
+ rule_by_status_id.each { |status_id, rule|
+ if rule.present?
+ WorkflowPermission.create(:role_id => @role.id, :tracker_id => @tracker.id, :old_status_id => status_id, :field_name => field, :rule => rule)
+ end
+ }
+ }
+ redirect_to :action => 'permissions', :role_id => @role, :tracker_id => @tracker
+ return
+ end
+
+ @statuses = @tracker.issue_statuses
+ @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).all.inject({}) do |h, w|
+ h[w.old_status_id] ||= {}
+ h[w.old_status_id][w.field_name] = w.rule
+ h
+ end
+ @statuses.each {|status| @permissions[status.id] ||= {}}
+ end
+ end
+
def copy
if params[:source_tracker_id].blank? || params[:source_tracker_id] == 'any'
@@ -83,7 +113,7 @@ class WorkflowsController < ApplicationController
elsif @target_trackers.nil? || @target_roles.nil?
flash.now[:error] = l(:error_workflow_copy_target)
else
- Workflow.copy(@source_tracker, @source_role, @target_trackers, @target_roles)
+ WorkflowRule.copy(@source_tracker, @source_role, @target_trackers, @target_roles)
flash[:notice] = l(:notice_successful_update)
redirect_to :action => 'copy', :source_tracker_id => @source_tracker, :source_role_id => @source_role
end