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

Merge branch 'zentaopms_239_fix_mutual_test' into 'zentaopms_239'

Browse Source 
* Fix bugs of mutual_test.

See merge request easycorp/zentaopms!5720
This commit is contained in:
王怡栋
2022-10-11 08:23:13 +00:00
parent ce344aff0a f5d987b55d
commit 238226a7f0
4 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+15 -4
View File
@@ -1304,16 +1304,27 @@ class executionModel extends model
{
if(strpos($mode, 'noclosed') !== false and ($execution->status == 'done' or $execution->status == 'closed')) continue;
if(strpos($mode, 'stagefilter') !== false and isset($executionModel) and $executionModel == 'waterfall' and in_array($execution->attribute, array('request', 'design', 'review'))) continue; // Some stages of waterfall not need.
if(empty($execution->multiple)) $noMultiples[$execution->id] = $execution->project;
$pairs[$execution->id] = $execution->name;
}
if($noMultiples)
{
$this->app->loadLang('project');
$noMultipleProjects = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->in($noMultiples)->fetchPairs('id', 'name');
foreach($noMultiples as $executionID => $projectID)
if(strpos($mode, 'hideMultiple') !== false)
{
if(isset($noMultipleProjects[$projectID])) $pairs[$executionID] = $noMultipleProjects[$projectID] . "({$this->lang->project->disableExecution})";
foreach($noMultiples as $executionID => $projectID) $pairs[$executionID] = '';
}
else
{
$this->app->loadLang('project');
$noMultipleProjects = $this->dao->select('id, name')->from(TABLE_PROJECT)->where('id')->in($noMultiples)->fetchPairs('id', 'name');
foreach($noMultiples as $executionID => $projectID)
{
if(isset($noMultipleProjects[$projectID])) $pairs[$executionID] = $noMultipleProjects[$projectID] . "({$this->lang->project->disableExecution})";
}
}
}