2 files changed, 4 insertions, 1 deletions
diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index 241ff2ffc..2376f36b0 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -54,6 +54,9 @@ class TimeEntry < ActiveRecord::Base
     joins(:project).
     where(TimeEntry.visible_condition(args.shift || User.current, *args))
   }
+  scope :left_join_issue, lambda {
+    joins("LEFT OUTER JOIN #{Issue.table_name} ON #{Issue.table_name}.id = #{TimeEntry.table_name}.issue_id")
+  }
   scope :on_issue, lambda {|issue|
     joins(:issue).
     where("#{Issue.table_name}.root_id = #{issue.root_id} AND #{Issue.table_name}.lft >= #{issue.lft} AND #{Issue.table_name}.rgt <= #{issue.rgt}")
diff --git a/app/models/time_entry_query.rb b/app/models/time_entry_query.rb
index eab1113e2..063074496 100644
--- a/app/models/time_entry_query.rb
+++ b/app/models/time_entry_query.rb
@@ -115,7 +115,7 @@ class TimeEntryQuery < Query
   def base_scope
     TimeEntry.visible.
       joins(:project, :user).
-      joins("LEFT OUTER JOIN issues ON issues.id = time_entries.issue_id").
+      left_join_issue.
       where(statement)
   end