kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Toshi MARUYAMA 2011-09-22 12:06:33 +00:00
parent 34f2d382b7
commit e683bd7582
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/time_entry.rb
View File

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