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

* Fix execution indentation when the parent does not exist. bug #42233.

Browse Source
This commit is contained in:
wangyuting
2024-02-21 17:11:47 +08:00
parent 9541393253
commit ba40b51aaa
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+5 -2
View File
@@ -4699,14 +4699,17 @@ class executionModel extends model
{
$rows = array();
$this->app->loadConfig('project');
foreach($executions as $execution)
$executionList = array();
foreach($executions as $execution) $executionList[$execution->id] = $execution;
foreach($executionList as $execution)
{
$execution->rawID = $execution->id;
$execution->isExecution = 1;
$execution->id = 'pid' . (string)$execution->id;
$execution->projectID = $execution->project;
$execution->project = $execution->projectName;
$execution->parent = ($execution->parent && $execution->grade > 1) ? 'pid' . (string)$execution->parent : '';
$execution->parent = (isset($executionList[$execution->parent]) && $execution->parent && $execution->grade > 1) ? 'pid' . (string)$execution->parent : '';
$execution->isParent = !empty($execution->isParent) or !empty($execution->tasks);
$execution->actions = array();
if(isset($this->config->projectExecution->dtable->actionsRule[$execution->projectModel]))