From efa7f79978058d3e4c5f38ecf272e2ddfb9ef8b3 Mon Sep 17 00:00:00 2001
From: "shiyangyangwork@yahoo.cn" <shiyangyang@cnezsoft.com>
Date: Mon, 9 Jan 2012 01:15:43 +0000
Subject: [PATCH]  * used getByStatus replace getByUclosed and getUnsolved in
 model of bug.

---
 module/bug/control.php |  4 ++--
 module/bug/model.php   | 31 ++++++++-----------------------
 module/story/model.php |  1 +
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 7f03b97abb..04b431bbde 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -96,8 +96,8 @@ class bug extends control
         elseif($browseType == 'openedbyme')    $bugs = $this->bug->getByOpenedbyme($productID, $projects, $orderBy, $pager);
         elseif($browseType == 'resolvedbyme')  $bugs = $this->bug->getByResolvedbyme($productID, $projects, $orderBy, $pager);
         elseif($browseType == 'assigntonull')  $bugs = $this->bug->getByAssigntonull($productID, $projects, $orderBy, $pager);
-        elseif($browseType == 'unresolved')    $bugs = $this->bug->getByUnresolved($productID, $projects, $orderBy, $pager);
-        elseif($browseType == 'unclosed')      $bugs = $this->bug->getByUnclosed($productID, $projects, $orderBy, $pager);
+        elseif($browseType == 'unresolved')    $bugs = $this->bug->getByStatus($productID, $projects, 'unresolved', $orderBy, $pager);
+        elseif($browseType == 'unclosed')      $bugs = $this->bug->getByStatus($productID, $projects, 'unclosed', $orderBy, $pager);
         elseif($browseType == 'longlifebugs')  $bugs = $this->bug->getByLonglifebugs($productID, $projects, $orderBy, $pager);
         elseif($browseType == 'postponedbugs') $bugs = $this->bug->getByPostponedbugs($productID, $projects, $orderBy, $pager);
         elseif($browseType == 'needconfirm')   $bugs = $this->bug->getByNeedconfirm($productID, $projects, $orderBy, $pager);
diff --git a/module/bug/model.php b/module/bug/model.php
index c8f1bfecd5..f68eb96259 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -818,39 +818,24 @@ class bugModel extends model
     }
 
     /**
-     * Get unsolved bugs. 
+     * Get bugs the status is active or unclosed. 
      * 
      * @param  int    $productID 
      * @param  array  $projects 
+     * @param  string $status 
      * @param  int    $queryID 
      * @param  string $orderBy 
      * @param  object $pager 
      * @access public
      * @return array
      */
-    public function getByUnresolved($productID, $projects, $orderBy, $pager)
+    public function getByStatus($productID, $projects, $status, $orderBy, $pager)
     {
-        return $this->dao->findByStatus('active')->from(TABLE_BUG)->andWhere('product')->eq($productID)
-            ->andWhere('project')->in(array_keys($projects))
-            ->andWhere('deleted')->eq(0)
-            ->orderBy($orderBy)->page($pager)->fetchAll();
-    }
-
-    /**
-     * Get unclosed bugs. 
-     * 
-     * @param  int    $productID 
-     * @param  array  $projects 
-     * @param  int    $queryID 
-     * @param  string $orderBy 
-     * @param  object $pager 
-     * @access public
-     * @return array
-     */
-    public function getByUnclosed($productID, $projects, $orderBy, $pager)
-    {
-        return $this->dao->select('*')->from(TABLE_BUG)->where('status')->ne('closed')->andWhere('product')->eq($productID)
-            ->andWhere('project')->in(array_keys($projects))
+        return $this->dao->select('*')->from(TABLE_BUG)
+            ->where('project')->in(array_keys($projects))
+            ->andWhere('product')->eq($productID)
+            ->beginIF($status == 'unclosed')->andWhere('status')->ne('closed')
+            ->beginIF($status == 'unresolved')->andWhere('status')->eq('active')
             ->andWhere('deleted')->eq(0)
             ->orderBy($orderBy)->page($pager)->fetchAll();
     }
diff --git a/module/story/model.php b/module/story/model.php
index 983dcb0526..ee93d505c6 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -178,6 +178,7 @@ class storyModel extends model
         }
         return false;
     }
+
     /**
      * Create a batch stories.
      *