From 70b0bc5168aff813398334d859db1212e86a2b48 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 4 Apr 2017 17:54:39 +0000 Subject: [PATCH] Adds a scope to left join the issue. git-svn-id: http://svn.redmine.org/redmine/trunk@16481 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/time_entry.rb | 3 +++ app/models/time_entry_query.rb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 -- 2.39.5