diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-08-20 10:27:39 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-08-20 10:27:39 +0000 |
| commit | 3539cfcf0f6e9f4379c5a15ae610608b370ee23c (patch) | |
| tree | ebdef3f7b0fbcd6fadb20b75098e2d208b6f310d /lib | |
| parent | a78c7249029828685173ecd86151fb80546d3032 (diff) | |
| download | redmine-3539cfcf0f6e9f4379c5a15ae610608b370ee23c.tar.gz redmine-3539cfcf0f6e9f4379c5a15ae610608b370ee23c.zip | |
Adds issue tracker and status columns and filters on spent time list (#23401).
git-svn-id: http://svn.redmine.org/redmine/trunk@15738 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/helpers/time_report.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/helpers/time_report.rb b/lib/redmine/helpers/time_report.rb index 8991592af..e06499ea8 100644 --- a/lib/redmine/helpers/time_report.rb +++ b/lib/redmine/helpers/time_report.rb @@ -45,7 +45,7 @@ module Redmine unless @criteria.empty? time_columns = %w(tyear tmonth tweek spent_on) @hours = [] - @scope.includes(:issue, :activity). + @scope.includes(:activity). group(@criteria.collect{|criteria| @available_criteria[criteria][:sql]} + time_columns). joins(@criteria.collect{|criteria| @available_criteria[criteria][:joins]}.compact). sum(:hours).each do |hash, hours| |