From c103a59465cdf3d49988207c574cdc22655e2e3e Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Thu, 7 Jun 2018 00:37:12 +0000 Subject: [PATCH] Merged r17368 from trunk to 3.4-stable (#27863). git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17369 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/issue.rb | 1 + test/unit/issue_test.rb | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/app/models/issue.rb b/app/models/issue.rb index 59f642a23..038a6accd 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -1632,6 +1632,7 @@ class Issue < ActiveRecord::Base copy.author = author copy.project = project copy.parent_issue_id = copied_issue_ids[child.parent_id] + copy.fixed_version_id = nil unless child.fixed_version.present? && child.fixed_version.status == 'open' unless copy.save logger.error "Could not copy subtask ##{child.id} while copying ##{@copied_from.id} to ##{id} due to validation errors: #{copy.errors.full_messages.join(', ')}" if logger next diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb index 3b4c268b7..7dcc7b838 100644 --- a/test/unit/issue_test.rb +++ b/test/unit/issue_test.rb @@ -1393,6 +1393,26 @@ class IssueTest < ActiveSupport::TestCase assert !issue.watched_by?(user2) end + def test_copy_should_clear_subtasks_target_version_if_locked_or_closed + version = Version.new(:project => Project.find(1), :name => '2.1',) + version.save! + + parent = Issue.generate! + child1 = Issue.generate!(:parent_issue_id => parent.id, :subject => 'Child 1', :fixed_version_id => 3) + child2 = Issue.generate!(:parent_issue_id => parent.id, :subject => 'Child 2', :fixed_version_id => version.id) + + version.status = 'locked' + version.save! + + copy = parent.reload.copy + + assert_difference 'Issue.count', 3 do + assert copy.save + end + + assert_equal [3, nil], copy.children.map(&:fixed_version_id) + end + def test_should_not_call_after_project_change_on_creation issue = Issue.new(:project_id => 1, :tracker_id => 1, :status_id => 1, :subject => 'Test', :author_id => 1) -- 2.39.5