##// END OF EJS Templates
Rails3: model: replace deprecated 'validate' method at TimeEntry model...
Toshi MARUYAMA -
r7328:e683bd75828e
parent child
Show More
@@ -1,110 +1,111
1 # Redmine - project management software
1 # Redmine - project management software
2 # Copyright (C) 2006-2011 Jean-Philippe Lang
2 # Copyright (C) 2006-2011 Jean-Philippe Lang
3 #
3 #
4 # This program is free software; you can redistribute it and/or
4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
7 # of the License, or (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software
15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17
17
18 class TimeEntry < ActiveRecord::Base
18 class TimeEntry < ActiveRecord::Base
19 # could have used polymorphic association
19 # could have used polymorphic association
20 # project association here allows easy loading of time entries at project level with one database trip
20 # project association here allows easy loading of time entries at project level with one database trip
21 belongs_to :project
21 belongs_to :project
22 belongs_to :issue
22 belongs_to :issue
23 belongs_to :user
23 belongs_to :user
24 belongs_to :activity, :class_name => 'TimeEntryActivity', :foreign_key => 'activity_id'
24 belongs_to :activity, :class_name => 'TimeEntryActivity', :foreign_key => 'activity_id'
25
25
26 attr_protected :project_id, :user_id, :tyear, :tmonth, :tweek
26 attr_protected :project_id, :user_id, :tyear, :tmonth, :tweek
27
27
28 acts_as_customizable
28 acts_as_customizable
29 acts_as_event :title => Proc.new {|o| "#{l_hours(o.hours)} (#{(o.issue || o.project).event_title})"},
29 acts_as_event :title => Proc.new {|o| "#{l_hours(o.hours)} (#{(o.issue || o.project).event_title})"},
30 :url => Proc.new {|o| {:controller => 'timelog', :action => 'index', :project_id => o.project, :issue_id => o.issue}},
30 :url => Proc.new {|o| {:controller => 'timelog', :action => 'index', :project_id => o.project, :issue_id => o.issue}},
31 :author => :user,
31 :author => :user,
32 :description => :comments
32 :description => :comments
33
33
34 acts_as_activity_provider :timestamp => "#{table_name}.created_on",
34 acts_as_activity_provider :timestamp => "#{table_name}.created_on",
35 :author_key => :user_id,
35 :author_key => :user_id,
36 :find_options => {:include => :project}
36 :find_options => {:include => :project}
37
37
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
42 named_scope :visible, lambda {|*args| {
43 named_scope :visible, lambda {|*args| {
43 :include => :project,
44 :include => :project,
44 :conditions => Project.allowed_to_condition(args.shift || User.current, :view_time_entries, *args)
45 :conditions => Project.allowed_to_condition(args.shift || User.current, :view_time_entries, *args)
45 }}
46 }}
46
47
47 def after_initialize
48 def after_initialize
48 if new_record? && self.activity.nil?
49 if new_record? && self.activity.nil?
49 if default_activity = TimeEntryActivity.default
50 if default_activity = TimeEntryActivity.default
50 self.activity_id = default_activity.id
51 self.activity_id = default_activity.id
51 end
52 end
52 self.hours = nil if hours == 0
53 self.hours = nil if hours == 0
53 end
54 end
54 end
55 end
55
56
56 def before_validation
57 def before_validation
57 self.project = issue.project if issue && project.nil?
58 self.project = issue.project if issue && project.nil?
58 end
59 end
59
60
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)
64 end
65 end
65
66
66 def hours=(h)
67 def hours=(h)
67 write_attribute :hours, (h.is_a?(String) ? (h.to_hours || h) : h)
68 write_attribute :hours, (h.is_a?(String) ? (h.to_hours || h) : h)
68 end
69 end
69
70
70 # tyear, tmonth, tweek assigned where setting spent_on attributes
71 # tyear, tmonth, tweek assigned where setting spent_on attributes
71 # these attributes make time aggregations easier
72 # these attributes make time aggregations easier
72 def spent_on=(date)
73 def spent_on=(date)
73 super
74 super
74 if spent_on.is_a?(Time)
75 if spent_on.is_a?(Time)
75 self.spent_on = spent_on.to_date
76 self.spent_on = spent_on.to_date
76 end
77 end
77 self.tyear = spent_on ? spent_on.year : nil
78 self.tyear = spent_on ? spent_on.year : nil
78 self.tmonth = spent_on ? spent_on.month : nil
79 self.tmonth = spent_on ? spent_on.month : nil
79 self.tweek = spent_on ? Date.civil(spent_on.year, spent_on.month, spent_on.day).cweek : nil
80 self.tweek = spent_on ? Date.civil(spent_on.year, spent_on.month, spent_on.day).cweek : nil
80 end
81 end
81
82
82 # Returns true if the time entry can be edited by usr, otherwise false
83 # Returns true if the time entry can be edited by usr, otherwise false
83 def editable_by?(usr)
84 def editable_by?(usr)
84 (usr == user && usr.allowed_to?(:edit_own_time_entries, project)) || usr.allowed_to?(:edit_time_entries, project)
85 (usr == user && usr.allowed_to?(:edit_own_time_entries, project)) || usr.allowed_to?(:edit_time_entries, project)
85 end
86 end
86
87
87 # TODO: remove this method in 1.3.0
88 # TODO: remove this method in 1.3.0
88 def self.visible_by(usr)
89 def self.visible_by(usr)
89 ActiveSupport::Deprecation.warn "TimeEntry.visible_by is deprecated and will be removed in Redmine 1.3.0. Use the visible scope instead."
90 ActiveSupport::Deprecation.warn "TimeEntry.visible_by is deprecated and will be removed in Redmine 1.3.0. Use the visible scope instead."
90 with_scope(:find => { :conditions => Project.allowed_to_condition(usr, :view_time_entries) }) do
91 with_scope(:find => { :conditions => Project.allowed_to_condition(usr, :view_time_entries) }) do
91 yield
92 yield
92 end
93 end
93 end
94 end
94
95
95 def self.earilest_date_for_project(project=nil)
96 def self.earilest_date_for_project(project=nil)
96 finder_conditions = ARCondition.new(Project.allowed_to_condition(User.current, :view_time_entries))
97 finder_conditions = ARCondition.new(Project.allowed_to_condition(User.current, :view_time_entries))
97 if project
98 if project
98 finder_conditions << ["project_id IN (?)", project.hierarchy.collect(&:id)]
99 finder_conditions << ["project_id IN (?)", project.hierarchy.collect(&:id)]
99 end
100 end
100 TimeEntry.minimum(:spent_on, :include => :project, :conditions => finder_conditions.conditions)
101 TimeEntry.minimum(:spent_on, :include => :project, :conditions => finder_conditions.conditions)
101 end
102 end
102
103
103 def self.latest_date_for_project(project=nil)
104 def self.latest_date_for_project(project=nil)
104 finder_conditions = ARCondition.new(Project.allowed_to_condition(User.current, :view_time_entries))
105 finder_conditions = ARCondition.new(Project.allowed_to_condition(User.current, :view_time_entries))
105 if project
106 if project
106 finder_conditions << ["project_id IN (?)", project.hierarchy.collect(&:id)]
107 finder_conditions << ["project_id IN (?)", project.hierarchy.collect(&:id)]
107 end
108 end
108 TimeEntry.maximum(:spent_on, :include => :project, :conditions => finder_conditions.conditions)
109 TimeEntry.maximum(:spent_on, :include => :project, :conditions => finder_conditions.conditions)
109 end
110 end
110 end
111 end
General Comments 0
You need to be logged in to leave comments. Login now