From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 18 Dec 2011 08:21:29 +0000 (+0000)
Subject: Rails3.1 compatibility
X-Git-Tag: 1.4.0~1012
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3717ff34afda47c02d5a6cc07bb14d049ebe18c6;p=redmine.git

Rails3.1 compatibility

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8275 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 9b6be7db6..be69d929f 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -522,7 +522,8 @@ class Issue < ActiveRecord::Base
   #   spent_hours => 0.0
   #   spent_hours => 50.2
   def total_spent_hours
-    @total_spent_hours ||= self_and_descendants.sum("#{TimeEntry.table_name}.hours", :include => :time_entries).to_f || 0.0
+    @total_spent_hours ||= self_and_descendants.sum("#{TimeEntry.table_name}.hours",
+      :joins => "LEFT JOIN #{TimeEntry.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id").to_f || 0.0
   end
 
   def relations