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

* Adjust code style.

Browse Source
This commit is contained in:
tianshujie98
2020-12-11 16:52:33 +08:00
parent f7d642e843
commit f734f15e7a
5 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+4 -3
View File
@@ -160,7 +160,7 @@ class task extends control
elseif($this->post->after == 'toTaskList')
{
setcookie('moduleBrowseParam', 0, 0, $this->config->webRoot, '', false, false);
$taskLink = $this->createLink('project', 'task', "projectID=$projectID&status=bymodule&param=$moduleID&orderBy=id_desc");
$taskLink = $this->createLink('project', 'task', "projectID=$projectID&status=unclosed&param=0&orderBy=id_desc");
$response['locate'] = $taskLink;
$this->send($response);
}
@@ -1024,9 +1024,10 @@ class task extends control
$changes = $this->task->close($taskID);
if(dao::isError()) die(js::error(dao::getError()));
if(!empty($changes))
if($this->post->comment != '' or !empty($changes))
{
$actionID = $this->action->create('task', $taskID, 'Closed', $this->post->comment);
$action = (!empty($changes)) ? 'Closed' : 'Commented';
$actionID = $this->action->create('task', $taskID, $action, $this->post->comment);
$this->action->logHistory($actionID, $changes);
}