mirror of
https://github.com/meineerde/redmine.git
synced 2026-02-01 03:57:15 +00:00
Do not journalize attachments that are added during a "Copy Issue" operation (#34921).
Patch by Jens Krämer. git-svn-id: http://svn.redmine.org/redmine/trunk@20872 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
e8d2c1fc8e
commit
f134831602
@ -1887,7 +1887,7 @@ class Issue < ActiveRecord::Base
|
||||
|
||||
# Callback on file attachment
|
||||
def attachment_added(attachment)
|
||||
if current_journal && !attachment.new_record?
|
||||
if current_journal && !attachment.new_record? && !copy?
|
||||
current_journal.journalize_attachment(attachment, :added)
|
||||
end
|
||||
end
|
||||
|
||||
@ -1511,6 +1511,23 @@ class IssueTest < ActiveSupport::TestCase
|
||||
assert_equal [3, nil], copy.children.map(&:assigned_to_id)
|
||||
end
|
||||
|
||||
def test_copy_should_not_add_attachments_to_journal
|
||||
set_tmp_attachments_directory
|
||||
issue = Issue.generate!
|
||||
copy = Issue.new
|
||||
copy.init_journal User.find(1)
|
||||
copy.copy_from issue
|
||||
|
||||
copy.project = issue.project
|
||||
copy.save_attachments(
|
||||
{ 'p0' => {'file' => mock_file_with_options(:original_filename => 'upload')} }
|
||||
)
|
||||
assert copy.save
|
||||
assert j = copy.journals.last
|
||||
assert_equal 1, j.details.size
|
||||
assert_equal 'relation', j.details[0].property
|
||||
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)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user