meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 23:11:12 +00:00
Code Issues Releases Wiki Activity

Use a single hash as argument.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@15805 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-09-01 17:39:02 +00:00
parent 30ff76db0f
commit ddc5755647
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/functional/issues_controller_test.rb
View File

@ -2092,7 +2092,7 @@ class IssuesControllerTest < Redmine::ControllerTest
@request.session[:user_id] = 2 @request.session[:user_id] = 2
tracker = Tracker.find(2) tracker = Tracker.find(2)
tracker.update! :default_status_id => 2 tracker.update! :default_status_id => 2
tracker.generate_transitions! 2, 1, :clear => true tracker.generate_transitions! 2 => 1, :clear => true
post :new, :project_id => 1, post :new, :project_id => 1,
:issue => {:tracker_id => 2, :issue => {:tracker_id => 2,

16
test/object_helpers.rb
View File

@ -243,23 +243,23 @@ module ObjectHelpers
end end
module TrackerObjectHelpers module TrackerObjectHelpers
def generate_transitions!(*args) def generate_transitions!(arg)
options = args.last.is_a?(Hash) ? args.pop : {} if arg.delete(:clear)
if args.size == 1
args << args.first
end
if options[:clear]
WorkflowTransition.where(:tracker_id => id).delete_all WorkflowTransition.where(:tracker_id => id).delete_all
end end
args.each_cons(2) do |old_status_id, new_status_id| role_id = arg.delete(:role_id) || 1
arg.each do |old_status_id, new_status_ids|
Array.wrap(new_status_ids).each do |new_status_id|
WorkflowTransition.create!( WorkflowTransition.create!(
:tracker => self, :tracker => self,
:role_id => (options[:role_id] || 1), :role_id => role_id,
:old_status_id => old_status_id, :old_status_id => old_status_id,
:new_status_id => new_status_id :new_status_id => new_status_id
) )
end end
end end
end
end end
Tracker.send :include, TrackerObjectHelpers Tracker.send :include, TrackerObjectHelpers