From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 22 Sep 2011 12:06:33 +0000 (+0000)
Subject: Rails3: model: replace deprecated 'validate' method at TimeEntry model
X-Git-Tag: 1.3.0~523
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e683bd75828ed6498bbec398897c4a2d1215abd0;p=redmine.git

Rails3: model: replace deprecated 'validate' method at TimeEntry model

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

diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index 60b5de1c3..9a03e4c8e 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -38,6 +38,7 @@ class TimeEntry < ActiveRecord::Base
   validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
   validates_numericality_of :hours, :allow_nil => true, :message => :invalid
   validates_length_of :comments, :maximum => 255, :allow_nil => true
+  validate :validate_time_entry
 
   named_scope :visible, lambda {|*args| {
     :include => :project,
@@ -57,7 +58,7 @@ class TimeEntry < ActiveRecord::Base
     self.project = issue.project if issue && project.nil?
   end
 
-  def validate
+  def validate_time_entry
     errors.add :hours, :invalid if hours && (hours < 0 || hours >= 1000)
     errors.add :project_id, :invalid if project.nil?
     errors.add :issue_id, :invalid if (issue_id && !issue) || (issue && project!=issue.project)