Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x

Browse Source
This commit is contained in:
holan20180123
2020-11-17 14:20:51 +08:00
parent 23362073ba cc65aa18ce
commit 206bb11f36
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+1 -1
View File
@@ -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
{
module/project/control.php
+10 -2
View File
@@ -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 = '';