From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 30 Aug 2011 05:08:21 +0000 (+0000)
Subject: Rails3: replace deprecated 'after_destroy' method at Attachment model.
X-Git-Tag: 1.3.0~1199
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=46fb8a850551748349e677f2d6051e89fdd7513b;p=redmine.git

Rails3: replace deprecated 'after_destroy' method at Attachment model.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6763 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 675d33fb5..dceb67893 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -47,6 +47,7 @@ class Attachment < ActiveRecord::Base
   @@storage_path = Redmine::Configuration['attachments_storage_path'] || "#{Rails.root}/files"
 
   before_save :files_to_final_location
+  after_destroy :delete_from_disk
 
   def validate_max_file_size
     if self.filesize > Setting.attachment_max_size.to_i.kilobytes
@@ -96,7 +97,7 @@ class Attachment < ActiveRecord::Base
   end
 
   # Deletes file on the disk
-  def after_destroy
+  def delete_from_disk
     File.delete(diskfile) if !filename.blank? && File.exist?(diskfile)
   end