summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2011-07-02 11:13:39 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2011-07-02 11:13:39 +0000
commit0a9bf389efe8aa7b5d140b7e3da407ce088294ae (patch)
tree85fd2578c995cc1d5b8245bd7fb0cf2b72c6eb83
parentd0d807caf1efafb7486dbf34c7de55e9bf8378bd (diff)
downloadredmine-0a9bf389efe8aa7b5d140b7e3da407ce088294ae.tar.gz
redmine-0a9bf389efe8aa7b5d140b7e3da407ce088294ae.zip
Fixed: Workflow copy does not copy advanced workflow settings (#8739).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6148 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/models/workflow.rb4
-rw-r--r--test/unit/workflow_test.rb37
2 files changed, 39 insertions, 2 deletions
diff --git a/app/models/workflow.rb b/app/models/workflow.rb
index 38a3454d0..4724897b6 100644
--- a/app/models/workflow.rb
+++ b/app/models/workflow.rb
@@ -89,8 +89,8 @@ class Workflow < ActiveRecord::Base
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
diff --git a/test/unit/workflow_test.rb b/test/unit/workflow_test.rb
new file mode 100644
index 000000000..bd713545f
--- /dev/null
+++ b/test/unit/workflow_test.rb
@@ -0,0 +1,37 @@
+# Redmine - project management software
+# Copyright (C) 2006-2011 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 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 Workflow.first(:conditions => {:role_id => 2, :tracker_id => 3, :old_status_id => 1, :new_status_id => 2, :author => false, :assignee => false})
+ assert Workflow.first(:conditions => {:role_id => 2, :tracker_id => 3, :old_status_id => 1, :new_status_id => 3, :author => false, :assignee => true})
+ assert Workflow.first(:conditions => {:role_id => 2, :tracker_id => 3, :old_status_id => 1, :new_status_id => 4, :author => true, :assignee => false})
+ end
+end