]> source.dussan.org Git - redmine.git/commitdiff
Use base_scope for issue query results (#35396).
authorGo MAEDA <maeda@farend.jp>
Sat, 19 Jun 2021 02:16:38 +0000 (02:16 +0000)
committerGo MAEDA <maeda@farend.jp>
Sat, 19 Jun 2021 02:16:38 +0000 (02:16 +0000)
Patch by Alexander Meindl.

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

app/models/issue_query.rb

index b36cbc5b1b484ee6ee88d6864a82eabd76c41bcd..e4da8d8c7be356a0d677506075f71ebe71f91a51 100644 (file)
@@ -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]).