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

Merge branch release/22.0.beta of zentao/zentaopms (#13453)

Browse Source
This commit is contained in:
刘刚
2026-01-23 14:44:11 +08:00
committed by Gitfox
parent 28d9fc05ce a47ec256fd
commit 3876f04de1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+4 -1
View File
@@ -1162,9 +1162,12 @@ 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';
if(!empty($projectInfo->isTpl)) $this->dao->filterTpl('never');
/* Waterfall execution, when all phases are closed, in reverse order of date. */
if(in_array($projectModel, array('waterfall', 'waterfallplus')))
{
module/execution/test/model/getpairs.php
-1
View File
@@ -57,7 +57,6 @@ $count = array(0, 1);
$modeList = array('', 'all', 'noclosed', 'stagefilter', 'withdelete', 'multiple', 'leaf', 'order_asc', 'noprefix', 'withobject', 'hideMultiple');
$executionTester = new executionModelTest();
$executionTester->executionModel->app->user->admin = true;
r($executionTester->getPairsTest($projectIDList[0], $count[0], $modeList[0])) && p('105') && e('敏捷项目1(不启用迭代的项目)'); // 敏捷项目执行查看
r($executionTester->getPairsTest($projectIDList[1], $count[0], $modeList[0])) && p('109') && e('/阶段13'); // 瀑布项目执行查看
r($executionTester->getPairsTest($projectIDList[2], $count[0], $modeList[0])) && p('126') && e('/看板30'); // 看板项目执行查看