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

* Refactor grouptask method.

Browse Source
This commit is contained in:
tianshujie
2023-09-05 14:56:07 +08:00
parent 530c77a5fe
commit 27104f793d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+3 -4
View File
@@ -208,7 +208,6 @@ class execution extends control
$tasks = $this->loadModel('task')->getExecutionTasks($executionID, 0, 'all', array(), $sort);
$groupBy = str_replace('`', '', $groupBy);
$groupTasks = array();
$groupByList = array();
$allCount = 0;
foreach($tasks as $task)
{
@@ -229,9 +228,9 @@ class execution extends control
}
/* Get users and build task group data. */
$users = $this->loadModel('user')->getPairs('noletter');
$tasks = $groupTasks;
$groupTasks = $this->executionZen->buildGroupTasks($groupBy, $groupTasks, $users);
$users = $this->loadModel('user')->getPairs('noletter');
$tasks = $groupTasks;
list($groupTasks, $groupByList) = $this->executionZen->buildGroupTasks($groupBy, $groupTasks, $users);
/* Remove task by filter and group. */
$filter = (empty($filter) && isset($this->lang->execution->groupFilter[$groupBy])) ? key($this->lang->execution->groupFilter[$groupBy]) : $filter;