Merged r1533 from trunk.

git-svn-id: http://redmine.rubyforge.org/svn/branches/0.7-stable@1534 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-06-14 12:32:26 +00:00
parent 2af910e8e6
commit e5b3c31e70
2 changed files with 7 additions and 3 deletions
@@ -30,8 +30,10 @@ class TimeEntry < ActiveRecord::Base
  validates_length_of :comments, :maximum => 255

  def after_initialize
-    if new_record?
-      self.activity ||= Enumeration.default('ACTI')
+    if new_record? && self.activity.nil?
+      if default_activity = Enumeration.default('ACTI')
+        self.activity_id = default_activity.id
+      end
    end
  end