From dd06aa3a92d0f38dc8414c828ac8a5f7c657b5ff Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 3 Sep 2015 17:15:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=BA=E7=A9=BA=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/query.rb | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/models/query.rb b/app/models/query.rb
index 19bd1bed5..e49147dea 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -492,25 +492,27 @@ class Query < ActiveRecord::Base
 
   def project_statement
     project_clauses = []
-    if project && !project.descendants.active.empty?
-      ids = [project.id]
-      if has_filter?("subproject_id")
-        case operator_for("subproject_id")
-        when '='
-          # include the selected subprojects
-          ids += values_for("subproject_id").each(&:to_i)
-        when '!*'
-          # main project only
-        else
-          # all subprojects
+    unless project.descendants.blank?
+      if project && !project.descendants.active.empty?
+        ids = [project.id]
+        if has_filter?("subproject_id")
+          case operator_for("subproject_id")
+            when '='
+              # include the selected subprojects
+              ids += values_for("subproject_id").each(&:to_i)
+            when '!*'
+              # main project only
+            else
+              # all subprojects
+              ids += project.descendants.collect(&:id)
+          end
+        elsif Setting.display_subprojects_issues?
           ids += project.descendants.collect(&:id)
         end
-      elsif Setting.display_subprojects_issues?
-        ids += project.descendants.collect(&:id)
+        project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
+      elsif project
+        project_clauses << "#{Project.table_name}.id = %d" % project.id
       end
-      project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
-    elsif project
-      project_clauses << "#{Project.table_name}.id = %d" % project.id
     end
     project_clauses.any? ? project_clauses.join(' AND ') : nil
   end