Mercurial > hg > soundsoftware-site
comparison app/models/time_entry.rb @ 128:07fa8a8b56a8
Update to Redmine trunk rev 4732
author | Chris Cannam |
---|---|
date | Wed, 19 Jan 2011 15:04:22 +0000 |
parents | 94944d00e43c |
children | cbce1fd3b1b7 |
comparison
equal
deleted
inserted
replaced
119:8661b858af72 | 128:07fa8a8b56a8 |
---|---|
64 | 64 |
65 # tyear, tmonth, tweek assigned where setting spent_on attributes | 65 # tyear, tmonth, tweek assigned where setting spent_on attributes |
66 # these attributes make time aggregations easier | 66 # these attributes make time aggregations easier |
67 def spent_on=(date) | 67 def spent_on=(date) |
68 super | 68 super |
69 if spent_on.is_a?(Time) | |
70 self.spent_on = spent_on.to_date | |
71 end | |
69 self.tyear = spent_on ? spent_on.year : nil | 72 self.tyear = spent_on ? spent_on.year : nil |
70 self.tmonth = spent_on ? spent_on.month : nil | 73 self.tmonth = spent_on ? spent_on.month : nil |
71 self.tweek = spent_on ? Date.civil(spent_on.year, spent_on.month, spent_on.day).cweek : nil | 74 self.tweek = spent_on ? Date.civil(spent_on.year, spent_on.month, spent_on.day).cweek : nil |
72 end | 75 end |
73 | 76 |