From: Go MAEDA <maeda@farend.jp>
Date: Sat, 19 Jun 2021 02:16:38 +0000 (+0000)
Subject: Use base_scope for issue query results (#35396).
X-Git-Tag: 5.0.0~369
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ffc9101e237ba711f5ad60a959d2254f3273d1c6;p=redmine.git

Use base_scope for issue query results (#35396).

Patch by Alexander Meindl.


git-svn-id: http://svn.redmine.org/redmine/trunk@21040 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb
index b36cbc5b1..e4da8d8c7 100644
--- a/app/models/issue_query.rb
+++ b/app/models/issue_query.rb
@@ -359,10 +359,8 @@ class IssueQuery < Query
       order_option << "#{Issue.table_name}.id DESC"
     end
 
-    scope = Issue.visible.
-      joins(:status, :project).
+    scope = base_scope.
       preload(:priority).
-      where(statement).
       includes(([:status, :project] + (options[:include] || [])).uniq).
       where(options[:conditions]).
       order(order_option).
@@ -409,9 +407,7 @@ class IssueQuery < Query
       order_option << "#{Issue.table_name}.id DESC"
     end
 
-    Issue.visible.
-      joins(:status, :project).
-      where(statement).
+    base_scope.
       includes(([:status, :project] + (options[:include] || [])).uniq).
       references(([:status, :project] + (options[:include] || [])).uniq).
       where(options[:conditions]).