diff --git a/module/task/ui/edit.html.php b/module/task/ui/edit.html.php index eb40dee9a8..c5c67c4022 100644 --- a/module/task/ui/edit.html.php +++ b/module/task/ui/edit.html.php @@ -244,7 +244,7 @@ detailBody ) ) ), - $task->parent >= 0 && empty($task->team) && $config->vision != 'lite' ? item + $task->parent >= 0 && $config->vision != 'lite' ? item ( set::name($lang->task->parent), picker diff --git a/module/task/ui/view.html.php b/module/task/ui/view.html.php index 57b85de12f..d0e6bb116e 100644 --- a/module/task/ui/view.html.php +++ b/module/task/ui/view.html.php @@ -123,6 +123,23 @@ if(!empty($task->cases)) } if($task->children) { + foreach($task->children as $child) + { + if($child->mode == 'multi' && strpos('done,closed', $child->status) === false) + { + $child->assignedTo = ''; + + $taskTeam = $this->task->getTeamByTask($child->id); + foreach($taskTeam as $teamMember) + { + if($this->app->user->account == $teamMember->account && $teamMember->status != 'done') + { + $child->assignedTo = $this->app->user->account; + break; + } + } + } + } $children = initTableData($task->children, $config->task->dtable->children->fieldList, $this->task); $sections[] = setting() ->title($lang->task->children)