diff --git a/module/bug/control.php b/module/bug/control.php index 16d0a0ec0e..b9a3528f25 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -123,6 +123,12 @@ class bug extends control ->andWhere('deleted')->eq(0) ->orderBy($orderBy)->page($pager)->fetchAll(); } + elseif($browseType == 'unclosed') + { + $bugs = $this->dao->select('*')->from(TABLE_BUG)->where('status')->ne('closed')->andWhere('product')->eq($productID) + ->andWhere('deleted')->eq(0) + ->orderBy($orderBy)->page($pager)->fetchAll(); + } elseif($browseType == 'longlifebugs') { $bugs = $this->dao->findByLastEditedDate("<", date(DT_DATE1, strtotime('-7 days')))->from(TABLE_BUG)->andWhere('product')->eq($productID) diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 0552d464ed..8faaebc3b2 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -94,6 +94,7 @@ $lang->bug->resolvedByMe = 'MyResolve'; $lang->bug->closedByMe = 'MyClose'; $lang->bug->assignToNull = 'Unassigned'; $lang->bug->unResolved = 'Unresolved'; +$lang->bug->unclosed = 'Unclosed'; $lang->bug->longLifeBugs = 'Longlife'; $lang->bug->postponedBugs = 'Postponed'; $lang->bug->allBugs = 'Allbug'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 0998ade191..6e6dc8ed4f 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -94,6 +94,7 @@ $lang->bug->resolvedByMe = '由我解决'; $lang->bug->closedByMe = '由我关闭'; $lang->bug->assignToNull = '未指派'; $lang->bug->unResolved = '未解决'; +$lang->bug->unclosed = '未关闭'; $lang->bug->longLifeBugs = '久未处理'; $lang->bug->postponedBugs = '被延期'; $lang->bug->allBugs = '所有Bug'; diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 92ee0f5b13..b838312f58 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -28,6 +28,7 @@ var customed = ; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=resolvedByMe¶m=0"), $lang->bug->resolvedByMe) . ""; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=assignToNull¶m=0"), $lang->bug->assignToNull) . ""; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=unResolved¶m=0"), $lang->bug->unResolved) . ""; + echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=unclosed¶m=0"), $lang->bug->unclosed) . ""; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=longLifeBugs¶m=0"), $lang->bug->longLifeBugs) . ""; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=postponedBugs¶m=0"), $lang->bug->postponedBugs) . ""; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=all¶m=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->bug->allBugs) . "";