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

* Finish task #85459.

Browse Source
This commit is contained in:
Yagami
2023-02-24 14:50:37 +08:00
parent 21523f68c9
commit b151d1fb32
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/view/kanban.html.php
+1 -1
View File
@@ -222,7 +222,7 @@ function renderExecutionItem(item, $item)
if(!$title.length)
{
if((item.type == 'kanban' && window.userPrivs.kanban) || (item.type != 'kanban' && window.userPrivs.execution))
if(!item.hasOwnProperty('children') && ((item.type == 'kanban' && window.userPrivs.kanban) || (item.type != 'kanban' && window.userPrivs.execution)))
{
var method = item.type == 'kanban' ? 'kanban' : 'task';
module/execution/control.php
+1 -1
View File
@@ -2812,7 +2812,7 @@ class execution extends control
{
$this->loadModel('project');
$projects = $this->project->getPairsByProgram('', 'noclosed');
$executions = $this->execution->getStatData(0, 'all', 0, 0, false, '', 'id_desc');
$executions = $this->execution->getStatData(0, 'all', 0, 0, false, 'withchild', 'id_desc');
foreach($executions as $execution)
{
module/execution/model.php
+5 -1
View File
@@ -2042,7 +2042,11 @@ class executionModel extends model
}
}
foreach($childList as $childID) unset($executions[$childID]);
if(strpos($param, 'withchild') === false)
{
foreach($childList as $childID) unset($executions[$childID]);
}
foreach($parentList as $parentID) unset($executions[$parentID]);
return array_values($executions);