From dddd25f18abfbedcbfb90ad9b5194422581dde2a Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 25 Aug 2015 15:14:22 +0800
Subject: [PATCH]  * finish task #2312.

---
 module/bug/control.php          | 1 +
 module/bug/lang/en.php          | 1 +
 module/bug/lang/zh-cn.php       | 1 +
 module/bug/model.php            | 1 +
 module/bug/view/browse.html.php | 1 +
 5 files changed, 5 insertions(+)

diff --git a/module/bug/control.php b/module/bug/control.php
index 046cbb7f20..8e2dffced8 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -103,6 +103,7 @@ class bug extends control
         elseif($browseType == 'unconfirmed')   $bugs = $this->bug->getUnconfirmed($productID, $projects, $sort, $pager);
         elseif($browseType == 'unresolved')    $bugs = $this->bug->getByStatus($productID, $projects, 'unresolved', $sort, $pager);
         elseif($browseType == 'unclosed')      $bugs = $this->bug->getByStatus($productID, $projects, 'unclosed', $sort, $pager);
+        elseif($browseType == 'toclosed')      $bugs = $this->bug->getByStatus($productID, $projects, 'toclosed', $sort, $pager);
         elseif($browseType == 'longlifebugs')  $bugs = $this->bug->getByLonglifebugs($productID, $projects, $sort, $pager);
         elseif($browseType == 'postponedbugs') $bugs = $this->bug->getByPostponedbugs($productID, $projects, $sort, $pager);
         elseif($browseType == 'needconfirm')   $bugs = $this->bug->getByNeedconfirm($productID, $projects, $sort, $pager);
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index bf3060638c..f76f720934 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -106,6 +106,7 @@ $lang->bug->resolvedByMe   = 'MyResolve';
 $lang->bug->closedByMe     = 'MyClose';
 $lang->bug->assignToNull   = 'Unassigned';
 $lang->bug->unResolved     = 'Unresolved';
+$lang->bug->toClosed       = 'Stay close';
 $lang->bug->unclosed       = 'Unclosed';
 $lang->bug->longLifeBugs   = 'Longlife';
 $lang->bug->postponedBugs  = 'Postponed';
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index d40ae6c9a3..3d7a6a67bf 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -106,6 +106,7 @@ $lang->bug->resolvedByMe   = '由我解决';
 $lang->bug->closedByMe     = '由我关闭';
 $lang->bug->assignToNull   = '未指派';
 $lang->bug->unResolved     = '未解决';
+$lang->bug->toClosed       = '待关闭';
 $lang->bug->unclosed       = '未关闭';
 $lang->bug->longLifeBugs   = '久未处理';
 $lang->bug->postponedBugs  = '被延期';
diff --git a/module/bug/model.php b/module/bug/model.php
index bc83873721..7bd2be7299 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -1386,6 +1386,7 @@ class bugModel extends model
             ->andWhere('product')->eq($productID)
             ->beginIF($status == 'unclosed')->andWhere('status')->ne('closed')->fi()
             ->beginIF($status == 'unresolved')->andWhere('status')->eq('active')->fi()
+            ->beginIF($status == 'toclosed')->andWhere('status')->eq('resolved')->fi()
             ->andWhere('deleted')->eq(0)
             ->orderBy($orderBy)->page($pager)->fetchAll();
     }
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 2338311fb7..52e0974bb9 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -27,6 +27,7 @@ js::set('moduleID', $moduleID);
     echo "<li id='unconfirmedTab'>"   . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=unconfirmed&param=0"),   $lang->bug->confirmedList[0])  . "</li>";
     echo "<li id='assigntonullTab'>"  . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=assignToNull&param=0"),  $lang->bug->assignToNull)  . "</li>";
     echo "<li id='unresolvedTab'>"    . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=unResolved&param=0"),    $lang->bug->unResolved)    . "</li>";
+    echo "<li id='toclosedTab'>"      . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=toClosed&param=0"),      $lang->bug->toClosed)      . "</li>";
     echo "<li id='longlifebugsTab'>"  . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=longLifeBugs&param=0"),  $lang->bug->longLifeBugs)  . "</li>";
     echo "<li id='postponedbugsTab'>" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=postponedBugs&param=0"), $lang->bug->postponedBugs) . "</li>";
     echo "<li id='needconfirmTab'>"   . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=needconfirm&param=0"), $lang->bug->needConfirm) . "</li>";