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

* [bug#69226,done,1h] query template data when the project is template.

Browse Source
This commit is contained in:
tianshujie
2026-01-23 13:17:25 +08:00
parent 28d9fc05ce
commit 311b80803c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+4 -1
View File
@@ -1162,7 +1162,8 @@ class executionModel extends model
$projectModel = '';
if($projectID)
{
$projectModel = $this->dao->select('model')->from(TABLE_EXECUTION)->where('id')->eq($projectID)->andWhere('deleted')->eq(0)->fetch('model');
$projectInfo = $this->dao->select('model,isTpl')->from(TABLE_EXECUTION)->where('id')->eq($projectID)->andWhere('deleted')->eq(0)->fetch();
$projectModel = isset($projectInfo->model) ? $projectInfo->model : '';
$orderBy = in_array($projectModel, array('waterfall', 'waterfallplus')) ? 'sortStatus_asc,begin_asc,id_asc' : 'id_desc';
/* Waterfall execution, when all phases are closed, in reverse order of date. */
@@ -1171,6 +1172,8 @@ class executionModel extends model
$statistic = $this->dao->select("count(id) as executions, sum(IF(INSTR('closed', status) < 1, 0, 1)) as closedExecutions")->from(TABLE_EXECUTION)->where('project')->eq($projectID)->andWhere('deleted')->eq('0')->fetch();
if($statistic->executions == $statistic->closedExecutions) $orderBy = 'sortStatus_asc,begin_desc,id_asc';
}
if(!empty($projectInfo->isTpl)) $this->dao->filterTpl('never');
}
/* Order by status's content whether or not done. */