From 581d8b349d195127139914085abab6bbc9e8634b Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Tue, 17 Nov 2020 14:14:30 +0800 Subject: [PATCH 1/2] * Finish task #8409. --- module/project/control.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/module/project/control.php b/module/project/control.php index 2196d68261..7c41d5cebb 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -1890,8 +1890,16 @@ class project extends control if($confirm == 'no') { /* Get the number of unfinished tasks and unresolved bugs. */ - $unfinishedTasks = $this->dao->select('COUNT(id) AS count')->from(TABLE_TASK)->where('project')->eq($projectID)->andWhere('deleted')->eq(0)->andWhere('status')->in('wait,doing')->fetch(); - $unresolvedBugs = $this->dao->select('COUNT(id) AS count')->from(TABLE_BUG)->where('project')->eq($projectID)->andWhere('deleted')->eq(0)->andWhere('status')->eq('active')->fetch(); + $unfinishedTasks = $this->dao->select('COUNT(id) AS count')->from(TABLE_TASK) + ->where('project')->eq($projectID) + ->andWhere('deleted')->eq(0) + ->andWhere('status')->in('wait,doing,pause') + ->fetch(); + $unresolvedBugs = $this->dao->select('COUNT(id) AS count')->from(TABLE_BUG) + ->where('project')->eq($projectID) + ->andWhere('deleted')->eq(0) + ->andWhere('status')->eq('active') + ->fetch(); /* Set prompt information. */ $tips = ''; From 0552e787f0fad9fea41012f490bef427ea711e24 Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Tue, 17 Nov 2020 14:19:44 +0800 Subject: [PATCH 2/2] * Finish task#8381. --- module/bug/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/bug/model.php b/module/bug/model.php index 3c9f5dad23..887dd0ef67 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -2579,7 +2579,7 @@ class bugModel extends model case 'id': if($canBatchAction) { - echo html::checkbox('bugIDList', array($bug->id => ''), '') . html::a(helper::createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id)); + echo html::checkbox('bugIDList', array($bug->id => '')) . html::a(helper::createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id)); } else {