Browse Source

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
tags/5.0.0
Go MAEDA 3 years ago
parent
commit
f134831602
2 changed files with 18 additions and 1 deletions
  1. 1
    1
      app/models/issue.rb
  2. 17
    0
      test/unit/issue_test.rb

+ 1
- 1
app/models/issue.rb View File

@@ -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

+ 17
- 0
test/unit/issue_test.rb View File

@@ -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…
Cancel
Save