From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Fri, 10 Jan 2014 05:02:44 +0000 (+0000)
Subject: Rails4: replace deprecated Relation#sum with finder options at Issue#total_spent_hours
X-Git-Tag: 2.5.0~311
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=56a3c1ad40e7d4f2b7d65ce0ffe7110069cffd60;p=redmine.git

Rails4: replace deprecated Relation#sum with finder options at Issue#total_spent_hours

git-svn-id: http://svn.redmine.org/redmine/trunk@12588 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/issue.rb b/app/models/issue.rb
index abf4cec92..6cfe97927 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -839,8 +839,10 @@ 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",
-      :joins => "LEFT JOIN #{TimeEntry.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id").to_f || 0.0
+    @total_spent_hours ||=
+      self_and_descendants.
+        joins("LEFT JOIN #{TimeEntry.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id").
+        sum("#{TimeEntry.table_name}.hours").to_f || 0.0
   end
 
   def relations