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

Private notes get copied without private flag to Duplicate issues (#22072).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@15196 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-03-12 08:21:32 +00:00
parent f800495885
commit 01cf5ed968
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/issue.rb
View File

@ -1568,6 +1568,7 @@ class Issue < ActiveRecord::Base
# Same user and notes # Same user and notes
if @current_journal if @current_journal
duplicate.init_journal(@current_journal.user, @current_journal.notes) duplicate.init_journal(@current_journal.user, @current_journal.notes)
duplicate.private_notes = @current_journal.private_notes
end end
duplicate.update_attribute :status, self.status duplicate.update_attribute :status, self.status
end end

18
test/unit/issue_test.rb
View File

@ -1274,6 +1274,24 @@ class IssueTest < ActiveSupport::TestCase
assert issue3.reload.closed? assert issue3.reload.closed?
end 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 def test_should_not_close_duplicated_issue
issue1 = Issue.generate! issue1 = Issue.generate!
issue2 = Issue.generate! issue2 = Issue.generate!