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

* Add case of execution method.

Browse Source
This commit is contained in:
tianshujie
2023-02-18 20:16:52 +08:00
parent 73077a3615
commit b05cad4add
3 changed files with 85 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+4 -1
View File
@@ -5609,6 +5609,7 @@ class executionModel extends model
*/
public function resetExecutionSorts($executions, $parentExecutions = array())
{
if(empty($executions)) return array();
if(empty($parentExecutions))
{
$execution = current($executions);
@@ -5616,6 +5617,7 @@ class executionModel extends model
->where('deleted')->eq(0)
->andWhere('type')->in('kanban,sprint,stage')
->andWhere('grade')->eq(1)
->andWhere('project')->eq($execution->project)
->orderBy('order_asc')
->fetchAll('id');
}
@@ -5623,9 +5625,10 @@ class executionModel extends model
$sortedExecutions = array();
foreach($parentExecutions as $executionID => $execution)
{
if(!isset($sortedExecutions[$executionID]) and isset($executions[$executionID])) $sortedExecutions[$executionID] = $executions[$executionID];
$children = $this->getChildExecutions($executionID, 'order_asc');
if(!empty($children)) $sortedExecutions += $this->resetExecutionSorts($executions, $children);
if(!isset($sortedExecutions[$executionID]) and isset($executions[$executionID])) $sortedExecutions[$executionID] = $executions[$executionID];
}
return $sortedExecutions;
}