# HG changeset patch # User olivier # Date 1435678924 -7200 # Tue Jun 30 17:42:04 2015 +0200 # Node ID 13426d55685c45e2bdff1c7c7ca0ef123a419da7 # Parent 27a843f160c6a676cfe28329c5b8897bb722549c Worktime- Rails 4.2 compatibility diff -r 27a843f160c6 -r 13426d55685c plugins/redmine_work_time/app/helpers/work_time_helper.rb --- a/plugins/redmine_work_time/app/helpers/work_time_helper.rb Tue Jun 30 16:31:18 2015 +0200 +++ b/plugins/redmine_work_time/app/helpers/work_time_helper.rb Tue Jun 30 17:42:04 2015 +0200 @@ -3,7 +3,7 @@ return "" unless issue issue_cost_est = issue.estimated_hours return "" unless issue_cost_est - issue_cost = TimeEntry.sum(:hours, :conditions=>["issue_id=:i",{:i=>issue.id}]) + issue_cost = TimeEntry.where("issue_id=#{issue.id}").sum(:hours) return sprintf("(%1.1f/%1.1f)",issue_cost,issue_cost_est) end @@ -11,7 +11,7 @@ return "" unless issue issue_cost_est = issue.estimated_hours return "" unless issue_cost_est - issue_cost = TimeEntry.sum(:hours, :conditions=>["issue_id=:i",{:i=>issue.id}]) + issue_cost = TimeEntry.where("issue_id=#{issue.id}").sum(:hours) return sprintf("%1.0f",issue_cost/issue_cost_est*100) end end