diff options
Diffstat (limited to 'app/models/time_entry.rb')
| -rw-r--r-- | app/models/time_entry.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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) |