Finish task #7413,7394,7391,7384,7381.

This commit is contained in:
tianshujie98
2020-07-13 14:21:29 +08:00
parent 74a1ac420d
commit a4b52c7e87
9 changed files with 13 additions and 11 deletions
+2
View File
@@ -1420,6 +1420,7 @@ class taskModel extends model
{
$oldTask = $this->getById($taskID);
$now = helper::now();
$today = helper::today();
if(strpos($this->config->task->finish->requiredFields, 'comment') !== false and !$this->post->comment)
{
@@ -1429,6 +1430,7 @@ class taskModel extends model
$task = fixer::input('post')
->setIF(is_numeric($this->post->consumed), 'consumed', (float)$this->post->consumed)
->setIF($oldTask->realStarted == '0000-00-00', 'realStarted', $today)
->setDefault('left', 0)
->setDefault('assignedTo', $oldTask->openedBy)
->setDefault('assignedDate', $now)