Fixed that deleting a system activity with children in use raises an error (#13783).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11763 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-01 17:10:15 +00:00
parent 6c39a260a3
commit c5ac2d3966
3 changed files with 37 additions and 4 deletions
@@ -107,10 +107,11 @@ module ObjectHelpers
  def TimeEntry.generate!(attributes={})
    entry = TimeEntry.new(attributes)
    entry.user ||= User.find(2)
-    entry.issue ||= Issue.find(1)
+    entry.issue ||= Issue.find(1) unless entry.project
    entry.project ||= entry.issue.project
    entry.activity ||= TimeEntryActivity.first
    entry.spent_on ||= Date.today
+    entry.hours ||= 1.0
    entry.save!
    entry
  end