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

* Fix code style.

Browse Source
This commit is contained in:
Yagami
2019-04-23 14:49:53 +08:00
parent 098b1e5868
commit 31f688c2c7
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+3 -2
View File
@@ -42,7 +42,7 @@ class taskModel extends model
->setDefault('openedDate', helper::now())
->stripTags($this->config->task->editor->create['id'], $this->config->allowedTags)
->join('mailto', ',')
->remove('after,files,labels,assignedTo,uid,storyEstimate,storyDesc,storyPri,team,teamEstimate,teamMember,multiple,teams,contactListMenu,selectTestStory,testStory,testPri,testEstStarted,testDeadline,testAssignedTo,testEstimate,feedback')
->remove('after,files,labels,assignedTo,uid,storyEstimate,storyDesc,storyPri,team,teamEstimate,teamMember,multiple,teams,contactListMenu,selectTestStory,testStory,testPri,testEstStarted,testDeadline,testAssignedTo,testEstimate')
->get();
if($task->type != 'test') $this->post->set('selectTestStory', 0);
@@ -1275,11 +1275,12 @@ class taskModel extends model
->setDefault('account', $this->app->user->account)
->setDefault('task', $taskID)
->setDefault('date', date(DT_DATE1))
->setIF($this->post->finishedDate, 'date', $this->post->finishedDate)
->setDefault('left', 0)
->remove('finishedDate,comment,assignedTo,files,labels,consumed')
->get();
$estimate->consumed = $consumed;
$estimate->date = $this->post->finishedDate;/*#task 7849*/
if($estimate->consumed) $this->addTaskEstimate($estimate);
if(!empty($oldTask->team))