jro_apps/redmine Commit - r7328:e683bd75828e

38

validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on

38

validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on

39

validates_numericality_of :hours, :allow_nil => true, :message => :invalid

39

validates_numericality_of :hours, :allow_nil => true, :message => :invalid

40

validates_length_of :comments, :maximum => 255, :allow_nil => true

40

validates_length_of :comments, :maximum => 255, :allow_nil => true

41

validate :validate_time_entry

41

42

named_scope :visible, lambda {|*args| {

43

named_scope :visible, lambda {|*args| {

43

:include => :project,

44

:include => :project,

57

self.project = issue.project if issue && project.nil?

58

self.project = issue.project if issue && project.nil?

58

end

59

end

59

60

def validate

61

def validate_time_entry

61

errors.add :hours, :invalid if hours && (hours < 0 || hours >= 1000)

62

errors.add :hours, :invalid if hours && (hours < 0 || hours >= 1000)

62

errors.add :project_id, :invalid if project.nil?

63

errors.add :project_id, :invalid if project.nil?

63

errors.add :issue_id, :invalid if (issue_id && !issue) || (issue && project!=issue.project)

64

errors.add :issue_id, :invalid if (issue_id && !issue) || (issue && project!=issue.project)

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

               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,
                 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)