From cb7663e691d04986a0eea68c4c2aa1e0101d14ad Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Tue, 1 Mar 2016 06:21:48 +0800
Subject: [PATCH] * adjust code for bug module.

---
 module/bug/control.php | 3 +--
 module/bug/model.php   | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 580ea9a1bf..d1a7c3c8bc 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -91,8 +91,7 @@ class bug extends control
         $projects = $this->loadModel('project')->getPairs() + array('0' => '');
 
         /* Get bugs. */
-        $childModuleIds = ($browseType == 'bymodule') ? $this->tree->getAllChildId($moduleID) : array();
-        $bugs = $this->bug->getBugs($productID, $projects, $branch, $browseType, $childModuleIds, $queryID, $sort, $pager);
+        $bugs = $this->bug->getBugs($productID, $projects, $branch, $browseType, $moduleID, $queryID, $sort, $pager);
 
         /* Process the sql, get the conditon partion, save it to session. */
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug', $browseType == 'needconfirm' ? false : true);
diff --git a/module/bug/model.php b/module/bug/model.php
index de52a75b14..1188424179 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -207,18 +207,18 @@ class bugModel extends model
      * @param  array  $projects
      * @param  int    $branch
      * @param  string $browseType
-     * @param  array  $childModuleIds
+     * @param  int    $moduleID
      * @param  int    $queryID
      * @param  string $sort
      * @param  object $pager
      * @access public
      * @return array
      */
-    public function getBugs($productID, $projects, $branch, $browseType, $childModuleIds, $queryID, $sort, $pager)
+    public function getBugs($productID, $projects, $branch, $browseType, $moduleID, $queryID, $sort, $pager)
     {
         /* Get bugs by browse type. */
         if($browseType == 'all')               $bugs = $this->getAllBugs($productID, $branch, $projects, $sort, $pager);
-        elseif($browseType == 'bymodule')      $bugs = $this->getModuleBugs($productID, $branch, $childModuleIds, $projects, $sort, $pager);
+        elseif($browseType == 'bymodule')      $bugs = $this->getModuleBugs($productID, $branch, $this->loadModel('tree')->getAllChildId($moduleID), $projects, $sort, $pager);
         elseif($browseType == 'assigntome')    $bugs = $this->getByAssigntome($productID, $branch, $projects, $sort, $pager);
         elseif($browseType == 'openedbyme')    $bugs = $this->getByOpenedbyme($productID, $branch, $projects, $sort, $pager);
         elseif($browseType == 'resolvedbyme')  $bugs = $this->getByResolvedbyme($productID, $branch, $projects, $sort, $pager);