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

* Adjust code of kanban and bug model.

Browse Source
This commit is contained in:
tianshujie
2022-01-17 17:24:42 +08:00
parent 3ee399a75c
commit 97a4fb7cc9
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+5 -2
View File
@@ -272,9 +272,12 @@ class bugModel extends model
$this->executeHooks($bugID);
if(isset($output['laneID']) and isset($output['columnID'])) $this->kanban->addKanbanCell($bug->execution, $output['laneID'], $output['columnID'], 'bug', $bugID);
if($bug->execution and (!isset($output['laneID']) or !isset($output['columnID']))) $this->kanban->updateLane($bug->execution, 'bug');
if($bug->execution)
{
if(isset($output['laneID']) and isset($output['columnID'])) $this->kanban->addKanbanCell($bug->execution, $output['laneID'], $output['columnID'], 'bug', $bugID);
if(!isset($output['laneID']) or !isset($output['columnID'])) $this->kanban->updateLane($bug->execution, 'bug');
}
/* When the bug is created by uploading the image, add the image to the file of the bug. */
$this->loadModel('score')->create('bug', 'create', $bugID);
if(!empty($data->uploadImage[$i]) and !empty($file))
module/kanban/model.php
+1
View File
@@ -635,6 +635,7 @@ class kanbanModel extends model
public function getRDKanban($executionID, $browseType = 'all', $orderBy = 'id_desc', $regionID = 0, $groupBy = 'default')
{
if($groupBy != 'default') return $this->getKanban4Group($executionID, $browseType, $groupBy);
$kanbanData = array();
$actions = array('sortGroup');
$regions = $this->getRegionPairs($executionID);