diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-03-12 10:04:19 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-03-12 10:04:19 +0000 |
| commit | 9b8e29741966da8c50e3b3d3e379c85847f689c9 (patch) | |
| tree | 606067b3aea98a1b97991bc3313e82994ffe75f6 | |
| parent | 557861047b5ba84d8ed6c1fb38a28ba2deaca80c (diff) | |
| download | redmine-9b8e29741966da8c50e3b3d3e379c85847f689c9.tar.gz redmine-9b8e29741966da8c50e3b3d3e379c85847f689c9.zip | |
Merged r15196 (#22072).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15208 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/issue.rb | 1 | ||||
| -rw-r--r-- | test/unit/issue_test.rb | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index 2ad842877..20961503d 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -1587,6 +1587,7 @@ class Issue < ActiveRecord::Base # Same user and notes if @current_journal duplicate.init_journal(@current_journal.user, @current_journal.notes) + duplicate.private_notes = @current_journal.private_notes end duplicate.update_attribute :status, self.status end diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb index 8a901e9ec..6974dbeb1 100644 --- a/test/unit/issue_test.rb +++ b/test/unit/issue_test.rb @@ -1226,6 +1226,24 @@ class IssueTest < ActiveSupport::TestCase assert issue3.reload.closed? end + def test_should_close_duplicates_with_private_notes + issue = Issue.generate! + duplicate = Issue.generate! + IssueRelation.create!(:issue_from => duplicate, :issue_to => issue, + :relation_type => IssueRelation::TYPE_DUPLICATES) + assert issue.reload.duplicates.include?(duplicate) + + # Closing issue with private notes + issue.init_journal(User.first, "Private notes") + issue.private_notes = true + issue.status = IssueStatus.where(:is_closed => true).first + assert_save issue + + duplicate.reload + assert journal = duplicate.journals.detect {|journal| journal.notes == "Private notes"} + assert_equal true, journal.private_notes + end + def test_should_not_close_duplicated_issue issue1 = Issue.generate! issue2 = Issue.generate! |