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

Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5

Browse Source
This commit is contained in:
tianshujie
2021-09-15 15:56:33 +08:00
parent 441cda176d 3c7139840f
commit caaaa90cf5
8 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+2 -2
View File
@@ -389,9 +389,9 @@ class task extends control
$task = $this->task->getById($taskID);
if($this->post->comment != '' or !empty($changes) or !empty($files))
{
$action = (!empty($changes) or !empty($files)) ? 'Edited' : 'Commented';
$action = (!empty($changes) or !empty($files)) ? 'Edited' : 'Commented';
$fileAction = !empty($files) ? $this->lang->addFiles . join(',', $files) . "\n" : '';
$actionID = $this->action->create('task', $taskID, $action, $fileAction . $this->post->comment);
$actionID = $this->action->create('task', $taskID, $action, $fileAction . $this->post->comment);
if(!empty($changes)) $this->action->logHistory($actionID, $changes);
}