Merged r4708 and r4709 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@4766 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-30 06:00:56 +00:00
parent 03085e85f9
commit 307e4ceaa2
3 changed files with 63 additions and 0 deletions
@@ -66,6 +66,9 @@ class TimeEntry < ActiveRecord::Base
  # 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