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

* Code for dtable.

Browse Source
This commit is contained in:
Yagami
2023-02-09 15:08:41 +08:00
parent d47e5a06f7
commit d24ea88a1c
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+6 -1
View File
@@ -1682,7 +1682,10 @@ class executionModel extends model
}
}
foreach($childList as $id) unset($executions[$id]);
if($this->app->moduleName != 'execution' and $this->app->methodName != 'all')
{
foreach($childList as $id) unset($executions[$id]);
}
return array_values($executions);
}
@@ -5225,6 +5228,8 @@ class executionModel extends model
$link = $execution->type == 'kanban' ? helper::createLink('execution', 'kanban', "id=$execution->id") : helper::createLink('execution', 'task', "id=$execution->id");
$execution->name = "<span class='project-type-label label label-outline $label'>{$this->lang->execution->typeList[$execution->type]}</span> " . html::a($link, $execution->name);
$execution->project = $execution->projectName;
$execution->parent = $execution->parent ? $execution->parent : '';
$execution->asParent = !empty($execution->children);
$execution->status = zget($this->lang->execution->statusList, $execution->status);
$execution->PM = zget($users, $execution->PM);
$execution->progress = $execution->hours->progress;