* [bug#50902,done,1h] fix bug.

This commit is contained in:
宋辰轩
2024-06-18 16:11:36 +08:00
committed by 綦新志
parent f304bf445f
commit 7769b30e2f
2 changed files with 6 additions and 7 deletions
+5 -3
View File
@@ -271,7 +271,10 @@ class task extends control
return $this->send($response);
}
$this->taskZen->buildAssignToForm($executionID, $taskID);
$this->view->task = $task;
$this->view->title = $this->view->execution->name . $this->lang->hyphen . $this->lang->task->assign;
$this->taskZen->buildUsersAndMembersToFrom($executionID, $taskID);
$this->display();
}
/**
@@ -467,11 +470,10 @@ class task extends control
$assignedTo = empty($task->assignedTo) ? $this->app->user->account : $task->assignedTo;
$this->view->title = $this->view->execution->name . $this->lang->hyphen .$this->lang->task->start;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->members = $this->user->getTeamMemberPairs($task->execution, 'execution', 'nodeleted');
$this->view->assignedTo = !empty($task->team) ? $this->task->getAssignedTo4Multi($task->team, $task) : $assignedTo;
$this->view->canRecordEffort = $this->task->canOperateEffort($task);
$this->view->currentTeam = $currentTeam;
$this->taskZen->buildUsersAndMembersToFrom($task->execution, $taskID);
$this->display();
}
+1 -4
View File
@@ -300,7 +300,7 @@ class taskZen extends task
* @access protected
* @return void
*/
protected function buildAssignToForm(int $executionID, int $taskID): void
protected function buildUsersAndMembersToFrom(int $executionID, int $taskID)
{
$task = $this->task->getByID($taskID);
$projectModel = $this->dao->findById($task->project)->from(TABLE_PROJECT)->fetch('model');
@@ -318,11 +318,8 @@ class taskZen extends task
if(!isset($members[$task->assignedTo])) $members[$task->assignedTo] = $task->assignedTo;
if(isset($members['closed']) || $task->status == 'closed') $members['closed'] = 'Closed';
$this->view->title = $this->view->execution->name . $this->lang->hyphen . $this->lang->task->assign;
$this->view->task = $task;
$this->view->members = $members;
$this->view->users = $this->loadModel('user')->getPairs();
$this->display();
}
/**