jro_apps/redmine Commit - r6192:49900051ea2b

Fixed: MailHandler does not include JournalDetail for attached files (#7966)....

Jean-Philippe Lang -

r6192:49900051ea2b

parent child

Context file:

r6192:49900051ea2b

Collapse all files

app/models/attachment.rb +2 -1

                                            :file => file,
                                            :description => attachment['description'].to_s.strip,
                                            :author => User.current)
+                     obj.attachments << a
                      if a.new_record?
                        obj.unsaved_attachments ||= []
                        obj.unsaved_attachments << a

app/models/issue.rb +8 -3

                has_many :relations_to, :class_name => 'IssueRelation', :foreign_key => 'issue_to_id', :dependent => :delete_all
                acts_as_nested_set :scope => 'root_id', :dependent => :destroy
-               acts_as_attachable :after_remove => :attachment_removed
+               acts_as_attachable :after_add => :attachment_added, :after_remove => :attachment_removed
                acts_as_customizable
                acts_as_watchable
                acts_as_searchable :columns => ['subject', "#{table_name}.description", "#{Journal.table_name}.notes"],
                    if valid?
                      attachments = Attachment.attach_files(self, params[:attachments])
-                     attachments[:files].each {|a| @current_journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
                      # TODO: Rename hook
                      Redmine::Hook.call_hook(:controller_issues_edit_before_save, { :params => params, :issue => self, :time_entry => @time_entry, :journal => @current_journal})
                      begin
                    end
                  end
                end
+               # Callback on attachment deletion
+               def attachment_added(obj)
+                 if @current_journal && !obj.new_record?
+                   @current_journal.details << JournalDetail.new(:property => 'attachment', :prop_key => obj.id, :value => obj.filename)
+                 end
+               end
                # Callback on attachment deletion
                def attachment_removed(obj)

app/models/mail_handler.rb +1 -1

                def add_attachments(obj)
                  if email.has_attachments?
                    email.attachments.each do |attachment|
-                     Attachment.create(:container => obj,
+                     obj.attachments << Attachment.create(:container => obj,
                                        :file => attachment,
                                        :author => user,
                                        :content_type => attachment.content_type)

test/unit/mail_handler_test.rb +25 -4

                  assert_equal 1, ActionMailer::Base.deliveries.size
                end
-               def test_add_issue_note
+               def test_update_issue
                  journal = submit_email('ticket_reply.eml')
                  assert journal.is_a?(Journal)
                  assert_equal User.find_by_login('jsmith'), journal.user
                  assert_equal 'Feature request', journal.issue.tracker.name
                end
-               def test_add_issue_note_with_attribute_changes
+               def test_update_issue_with_attribute_changes
                  # This email contains: 'Status: Resolved'
                  journal = submit_email('ticket_reply_with_status.eml')
                  assert journal.is_a?(Journal)
                  assert !journal.notes.match(/^Status:/i)
                  assert !journal.notes.match(/^Start Date:/i)
                end
+               def test_update_issue_with_attachment
+                 assert_difference 'Journal.count' do
+                   assert_difference 'JournalDetail.count' do
+                     assert_difference 'Attachment.count' do
+                       assert_no_difference 'Issue.count' do
+                         journal = submit_email('ticket_with_attachment.eml') do |raw|
+                           raw.gsub! /^Subject: .*$/, 'Subject: Re: [Cookbook - Feature #2] (New) Add ingredients categories'
+                         end
+                       end
+                     end
+                   end
+                 end
+                 journal = Journal.first(:order => 'id DESC')
+                 assert_equal Issue.find(2), journal.journalized
+                 assert_equal 1, journal.details.size
+                 detail = journal.details.first
+                 assert_equal 'attachment', detail.property
+                 assert_equal 'Paella.jpg', detail.value
+               end
-               def test_add_issue_note_should_send_email_notification
+               def test_update_issue_should_send_email_notification
                  ActionMailer::Base.deliveries.clear
                  journal = submit_email('ticket_reply.eml')
                  assert journal.is_a?(Journal)
                  assert_equal 1, ActionMailer::Base.deliveries.size
                end
-               def test_add_issue_note_should_not_set_defaults
+               def test_update_issue_should_not_set_defaults
                  journal = submit_email('ticket_reply.eml', :issue => {:tracker => 'Support request', :priority => 'High'})
                  assert journal.is_a?(Journal)
                  assert_match /This is reply/, journal.notes

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages