From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 31 Aug 2011 04:07:15 +0000 (+0000)
Subject: Rails3: replace deprecated 'validate' method at WikiPage model.
X-Git-Tag: 1.3.0~1128
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=73df51454bf561025d1994ec9b9a0ad5fc5b7901;p=redmine.git

Rails3: replace deprecated 'validate' method at WikiPage model.

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

diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index f937b8d67..4c2c7adb9 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -42,6 +42,8 @@ class WikiPage < ActiveRecord::Base
   validates_uniqueness_of :title, :scope => :wiki_id, :case_sensitive => false
   validates_associated :content
 
+  validate :validate_parent_title
+
   # eager load information about last updates, without loading text
   named_scope :with_updated_on, {
     :select => "#{WikiPage.table_name}.*, #{WikiContent.table_name}.updated_on",
@@ -161,7 +163,7 @@ class WikiPage < ActiveRecord::Base
 
   protected
 
-  def validate
+  def validate_parent_title
     errors.add(:parent_title, :invalid) if !@parent_title.blank? && parent.nil?
     errors.add(:parent_title, :circular_dependency) if parent && (parent == self || parent.ancestors.include?(self))
     errors.add(:parent_title, :not_same_project) if parent && (parent.wiki_id != wiki_id)