Mercurial > hg > soundsoftware-site
diff app/models/.svn/text-base/time_entry.rb.svn-base @ 129:5e974759e8b2 cannam
Merge from the default branch
author | Chris Cannam |
---|---|
date | Wed, 19 Jan 2011 15:15:02 +0000 |
parents | 07fa8a8b56a8 |
children | cbce1fd3b1b7 |
line wrap: on
line diff
--- a/app/models/.svn/text-base/time_entry.rb.svn-base Wed Jan 19 13:27:01 2011 +0000 +++ b/app/models/.svn/text-base/time_entry.rb.svn-base Wed Jan 19 15:15:02 2011 +0000 @@ -66,6 +66,9 @@ # these attributes make time aggregations easier def spent_on=(date) super + if spent_on.is_a?(Time) + self.spent_on = spent_on.to_date + end self.tyear = spent_on ? spent_on.year : nil self.tmonth = spent_on ? spent_on.month : nil self.tweek = spent_on ? Date.civil(spent_on.year, spent_on.month, spent_on.day).cweek : nil