From 6e356071dd3baa85e842ce91a391798409a2ee21 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 10 Mar 2015 19:42:45 +0000 Subject: Fixed that spent time on my page does not include entries without issue (#19320). git-svn-id: http://svn.redmine.org/redmine/trunk@14071 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/my_helper.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/helpers') diff --git a/app/helpers/my_helper.rb b/app/helpers/my_helper.rb index fdb51d61c..0f4f7b835 100644 --- a/app/helpers/my_helper.rb +++ b/app/helpers/my_helper.rb @@ -68,7 +68,9 @@ module MyHelper def timelog_items TimeEntry. where("#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", User.current.id, Date.today - 6, Date.today). - joins(:activity, :project, {:issue => [:tracker, :status]}). + joins(:activity, :project). + references(:issue => [:tracker, :status]). + includes(:issue => [:tracker, :status]). order("#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC"). to_a end -- cgit v1.2.3