From 4bbd3d81fd5f8860703aa9a29bb6166a334cc6cc Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 7 Feb 2015 09:10:57 +0000
Subject: TimeEntry acts_as_activity_provider scope should joins(:project)
 (#18818).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Patch by Ondřej Ezr.

git-svn-id: http://svn.redmine.org/redmine/trunk@13971 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/time_entry.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/models/time_entry.rb')

diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index 2445a3357..f66fbc78a 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -35,7 +35,7 @@ class TimeEntry < ActiveRecord::Base
 
   acts_as_activity_provider :timestamp => "#{table_name}.created_on",
                             :author_key => :user_id,
-                            :scope => preload(:project)
+                            :scope => joins(:project).preload(:project)
 
   validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
   validates_numericality_of :hours, :allow_nil => true, :message => :invalid
-- 
cgit v1.2.3