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

Merge branch '12.x'

Browse Source
This commit is contained in:
z
2020-11-23 20:42:59 +08:00
parent 6ce3a0345b a6b21d74b7
commit b42d47e257
230 changed files with 5568 additions and 1943 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+6 -3
View File
@@ -706,6 +706,8 @@ class task extends control
{
$this->commonAction($taskID);
$task = $this->task->getById($taskID);
if(!empty($_POST))
{
$this->loadModel('action');
@@ -719,11 +721,9 @@ class task extends control
$this->action->logHistory($actionID, $changes);
}
/* Remind whether to update status of the bug, if task which from that bug has been finished. */
$task = $this->task->getById($taskID);
$this->executeHooks($taskID);
/* Remind whether to update status of the bug, if task which from that bug has been finished. */
if($changes and $this->task->needUpdateBugStatus($task))
{
foreach($changes as $change)
@@ -744,7 +744,10 @@ class task extends control
$this->view->title = $this->view->project->name . $this->lang->colon .$this->lang->task->start;
$this->view->position[] = $this->lang->task->start;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->members = $this->loadModel('project')->getTeamMemberPairs($task->project, 'nodeleted');
$this->view->assignedTo = $task->assignedTo == '' ? $this->app->user->account : $task->assignedTo;
$this->display();
}