Redmine

Yuichi HARADA wrote:

I created a patch. I fix to show subprojects issues even if all subprojects are closed.

Thank you for posting the patch.

What do you think about the following approach? The number of lines to be changed is minimal, and also fixes #34375.

diff --git a/app/models/query.rb b/app/models/query.rb
index 18f1b135b..8ed09579d 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -898,10 +898,10 @@ class Query < ActiveRecord::Base

   def project_statement
     project_clauses = []
-    active_subprojects_ids = []
+    non_archived_subprojects_ids = []

-    active_subprojects_ids = project.descendants.active.map(&:id) if project
-    if active_subprojects_ids.any?
+    non_archived_subprojects_ids = project.descendants.where.not(status: Project::STATUS_ARCHIVED).ids if project
+    if non_archived_subprojects_ids.any?
       if has_filter?("subproject_id")
         case operator_for("subproject_id")
         when '='
@@ -910,7 +910,7 @@ class Query < ActiveRecord::Base
           project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
         when '!'
           # exclude the selected subprojects
-          ids = [project.id] + active_subprojects_ids - values_for("subproject_id").map(&:to_i)
+          ids = [project.id] + non_archived_subprojects_ids - values_for("subproject_id").map(&:to_i)
           project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
         when '!*'
           # main project only

Go MAEDA wrote:

What do you think about the following approach? The number of lines to be changed is minimal, and also fixes #34375.

[...]

That's great. I have confirmed that #34375 is also improved with minimal changes.