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

Merge branch 'pailei_zhangzilong_49888' into 'pailei2'

Browse Source 
Pailei zhangzilong 49888

See merge request easycorp/zentaopms!2155
This commit is contained in:
孙广明
2022-03-09 06:41:53 +00:00
parent aa15a88a2c 4ba238cd27
commit 4c218d7a69
24 changed files with 411 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+13 -2
View File
@@ -64,7 +64,7 @@ class taskModel extends model
->cleanINT('execution,story,module')
->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,sync,otherLane,region')
->remove('after,files,labels,assignedTo,uid,storyEstimate,storyDesc,storyPri,team,teamEstimate,teamMember,multiple,teams,contactListMenu,selectTestStory,testStory,testPri,testEstStarted,testDeadline,testAssignedTo,testEstimate,sync,otherLane,region,lane')
->add('version', 1)
->get();
@@ -331,6 +331,7 @@ class taskModel extends model
if($assignedTo) $data[$i]->assignedDate = $now;
if(strpos($this->config->task->create->requiredFields, 'estStarted') !== false and empty($estStarted)) $data[$i]->estStarted = '';
if(strpos($this->config->task->create->requiredFields, 'deadline') !== false and empty($deadline)) $data[$i]->deadline = '';
if(isset($tasks->lanes[$i])) $data[$i]->laneID = $tasks->lanes[$i];
foreach($extendFields as $extendField)
{
@@ -387,6 +388,13 @@ class taskModel extends model
foreach($data as $i => $task)
{
$laneID = isset($output['laneID']) ? $output['laneID'] : 0;
if(isset($task->laneID))
{
$laneID = $task->laneID;
unset($task->laneID);
}
$task->version = 1;
$this->dao->insert(TABLE_TASK)->data($task)
->autoCheck()
@@ -418,7 +426,10 @@ class taskModel extends model
}
else
{
if(isset($output['laneID']) and isset($output['columnID'])) $this->kanban->addKanbanCell($executionID, $output['laneID'], $output['columnID'], 'task', $taskID);
$columnID = $this->kanban->getColumnIDByLaneID($laneID, 'wait');
if(empty($columnID)) $columnID = isset($output['columnID']) ? $output['columnID'] : 0;
if(!empty($laneID) and !empty($columnID)) $this->kanban->addKanbanCell($executionID, $laneID, $columnID, 'task', $taskID);
}
$actionID = $this->action->create('task', $taskID, 'Opened', '');