Browse files

Correctly copy advanced workflow settings #904

Original commit message:
Fixed: Workflow copy does not copy advanced workflow settings

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@6148 e93f8b46-1217-0410-a6f0-8f06a7374b81
  • Loading branch information...
1 parent 19dd488 commit a2f8557f238783479426a31565f58f5ae6333444 jplang committed with thegcat Jul 2, 2011
Showing with 35 additions and 2 deletions.
  1. +2 −2 app/models/workflow.rb
  2. +33 −0 test/unit/workflow_test.rb
View
4 app/models/workflow.rb
@@ -86,8 +86,8 @@ def self.copy_one(source_tracker, source_role, target_tracker, target_role)
else
transaction do
delete_all :tracker_id => target_tracker.id, :role_id => target_role.id
- connection.insert "INSERT INTO #{Workflow.table_name} (tracker_id, role_id, old_status_id, new_status_id)" +
- " SELECT #{target_tracker.id}, #{target_role.id}, old_status_id, new_status_id" +
+ connection.insert "INSERT INTO #{Workflow.table_name} (tracker_id, role_id, old_status_id, new_status_id, author, assignee)" +
+ " SELECT #{target_tracker.id}, #{target_role.id}, old_status_id, new_status_id, author, assignee" +
" FROM #{Workflow.table_name}" +
" WHERE tracker_id = #{source_tracker.id} AND role_id = #{source_role.id}"
end
View
33 test/unit/workflow_test.rb
@@ -0,0 +1,33 @@
+#-- copyright
+# ChiliProject is a project management system.
+#
+# Copyright (C) 2010-2012 the ChiliProject Team
+#
+# 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.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+require File.expand_path('../../test_helper', __FILE__)
+
+class WorkflowTest < ActiveSupport::TestCase
+ fixtures :roles, :trackers, :issue_statuses
+
+ def test_copy
+ Workflow.delete_all
+ Workflow.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 1, :new_status_id => 2)
+ Workflow.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 1, :new_status_id => 3, :assignee => true)
+ Workflow.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 1, :new_status_id => 4, :author => true)
+
+ assert_difference 'Workflow.count', 3 do
+ Workflow.copy(Tracker.find(2), Role.find(1), Tracker.find(3), Role.find(2))
+ end
+
+ assert_equal 1, Workflow.count(:conditions => {:role_id => 2, :tracker_id => 3, :old_status_id => 1, :new_status_id => 2, :author => false, :assignee => false})
+ assert_equal 1, Workflow.count(:conditions => {:role_id => 2, :tracker_id => 3, :old_status_id => 1, :new_status_id => 3, :author => false, :assignee => true})
+ assert_equal 1, Workflow.count(:conditions => {:role_id => 2, :tracker_id => 3, :old_status_id => 1, :new_status_id => 4, :author => true, :assignee => false})
+ end
+end

0 comments on commit a2f8557

Please sign in to comment.