From 184be9d0e3aff4e5166d7ea3d35aeb55a81162ee Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Wed, 27 Jun 2007 18:59:36 +0000 Subject: [PATCH] Fixed: time report doesn't take account of the project for time calculations git-svn-id: http://redmine.rubyforge.org/svn/trunk@575 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/timelog_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb index bed6b1c0..01c4ddca 100644 --- a/app/controllers/timelog_controller.rb +++ b/app/controllers/timelog_controller.rb @@ -64,7 +64,8 @@ class TimelogController < ApplicationController sql = "SELECT #{sql_select}, tyear, tmonth, tweek, SUM(hours) AS hours" sql << " FROM #{TimeEntry.table_name} LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id" - sql << " WHERE spent_on BETWEEN '%s' AND '%s'" % [ActiveRecord::Base.connection.quoted_date(@date_from.to_time), ActiveRecord::Base.connection.quoted_date(@date_to.to_time)] + sql << " WHERE #{TimeEntry.table_name}.project_id = %s" % @project.id + sql << " AND spent_on BETWEEN '%s' AND '%s'" % [ActiveRecord::Base.connection.quoted_date(@date_from.to_time), ActiveRecord::Base.connection.quoted_date(@date_to.to_time)] sql << " GROUP BY #{sql_group_by}, tyear, tmonth, tweek" @hours = ActiveRecord::Base.connection.select_all(sql)