comparison app/models/time_entry.rb @ 41:7f0e922c8982 luisf

merged with new version from trunk
author luisf
date Fri, 19 Nov 2010 14:45:28 +0000
parents 94944d00e43c
children 07fa8a8b56a8
comparison
equal deleted inserted replaced
35:67e8aef29de9 41:7f0e922c8982
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 => 'details', :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,