From fe28193e4eb9af2dc5262535a29ffde5249568fc Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 21 Feb 2009 11:04:50 +0000 Subject: Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2493 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/wiki_page.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/models/wiki_page.rb') diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index 0d96cc047..f8bbcdebd 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -129,9 +129,9 @@ class WikiPage < ActiveRecord::Base protected def validate - errors.add(:parent_title, :activerecord_error_invalid) if !@parent_title.blank? && parent.nil? - errors.add(:parent_title, :activerecord_error_circular_dependency) if parent && (parent == self || parent.ancestors.include?(self)) - errors.add(:parent_title, :activerecord_error_not_same_project) if parent && (parent.wiki_id != wiki_id) + 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) end end -- cgit v1.2.3