From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 22 Sep 2011 00:53:53 +0000 (+0000)
Subject: Rails3: model: replace deprecated 'before_destroy' method at WikiPage model
X-Git-Tag: 1.3.0~533
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ec1b9f38f3d2dfbeb909b6b83e9815d5b7ad3d8e;p=redmine.git

Rails3: model: replace deprecated 'before_destroy' method at WikiPage model

test_redirects_removed_when_deleting_page at unit wiki_redirect_test.rb has this test.

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

diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 4c2c7adb9..2fe2be53f 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -43,6 +43,7 @@ class WikiPage < ActiveRecord::Base
   validates_associated :content
 
   validate :validate_parent_title
+  before_destroy :remove_redirects
 
   # eager load information about last updates, without loading text
   named_scope :with_updated_on, {
@@ -86,7 +87,7 @@ class WikiPage < ActiveRecord::Base
     end
   end
 
-  def before_destroy
+  def remove_redirects
     # Remove redirects to this page
     wiki.redirects.find_all_by_redirects_to(title).each(&:destroy)
   end