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

* Fix default lane error. bug #44682.

Browse Source
This commit is contained in:
wangyuting
2024-01-23 14:47:16 +08:00
parent 56cda38f8d
commit a7b3497277
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/zen.php
+13 -5
View File
@@ -951,7 +951,8 @@ class bugZen extends bug
$linkedProducts = $this->product->getProducts($executionID);
foreach($linkedProducts as $product) $products[$product->id] = $product->name;
$projectID = $bug->execution->project;
$execution = $this->loadModel('execution')->getByID($executionID);
$projectID = $execution->project;
$this->loadModel('execution')->setMenu($executionID);
}
@@ -1001,7 +1002,7 @@ class bugZen extends bug
$productID = (int)$bug->productID;
$branch = (string)$bug->branch;
$moduleID = (int)$bug->moduleID;
$modules = $this->tree->getOptionMenu($bug->productID, 'bug', 0, ($bug->branch === 'all' || !isset($bug->branches[$bug->branch])) ? 'all' : $bug->branch);
$modules = $this->tree->getOptionMenu($productID, 'bug', 0, ($branch === 'all' || !isset($bug->branches[$branch])) ? 'all' : $branch);
$moduleID = isset($modules[$moduleID]) ? $moduleID : '';
return $this->updateBug($bug, array('modules' => $modules, 'moduleID' => $moduleID));
@@ -1199,7 +1200,7 @@ class bugZen extends bug
$this->view->bug = $bug;
$this->view->allBuilds = !empty($bug->allBuilds) ? $bug->allBuilds : '';
$this->view->allUsers = !empty($bug->allUsers) ? $bug->allUsers : '';
$this->view->releasedBuilds = $this->loadModel('release')->getReleasedBuilds((int)$bug->productID, $bug->branch);
$this->view->releasedBuilds = $this->loadModel('release')->getReleasedBuilds((int)$bug->productID, (string)$bug->branch);
$this->view->resultFiles = !empty($resultID) && !empty($stepIdList) ? $this->loadModel('file')->getByObject('stepResult', (int)$resultID, str_replace('_', ',', $stepIdList)) : array();
$this->view->contactList = $this->loadModel('user')->getContactLists();
$this->view->branchID = $bug->branch != 'all' ? $bug->branch : '0';
@@ -1464,8 +1465,15 @@ class bugZen extends bug
{
$regionPairs = $this->loadModel('kanban')->getRegionPairs($execution->id, 0, 'execution');
$regionID = !empty($output['regionID']) ? $output['regionID'] : key($regionPairs);
$lanePairs = $this->kanban->getLanePairsByRegion((int)$regionID, 'bug');
$laneID = !empty($output['laneID']) ? $output['laneID'] : key($lanePairs);
if(!empty($output['groupID']))
{
$lanePairs = $this->kanban->getLanePairsByGroup((int)$output['groupID']);
$laneID = !empty($output['laneID']) ? $output['laneID'] : key($lanePairs);
}
$lanePairs = $this->kanban->getLanePairsByRegion((int)$regionID, 'bug');
if(empty($laneID)) $laneID = !empty($output['laneID']) ? $output['laneID'] : key($lanePairs);
$this->view->executionType = $execution->type;
$this->view->regionID = $regionID;
module/execution/js/kanban.ui.js
+1 -1
View File
@@ -118,7 +118,7 @@ window.buildColCardActions = function(col)
}
else if(col.type == 'unconfirmed')
{
if(priv.canCreateBug) actions.push({text: bugLang.create, url: $.createLink('bug', 'create', 'productID=' + productID + '&moduleID=0&extra=regionID=' + col.region + ',laneID=' + 0 + ',columnID=' + col.id + ',executionID=' + executionID), 'data-toggle': 'modal', 'data-size' : 'lg'});
if(priv.canCreateBug) actions.push({text: bugLang.create, url: $.createLink('bug', 'create', 'productID=' + productID + '&moduleID=0&extra=regionID=' + col.region + ',groupID=' + col.group + ',laneID=' + 0 + ',columnID=' + col.id + ',executionID=' + executionID), 'data-toggle': 'modal', 'data-size' : 'lg'});
if(priv.canBatchCreateBug) actions.push({text: bugLang.batchCreate, url: productCount > 1 ? '#batchCreateBug' : $.createLink('bug', 'batchcreate', 'productID=' + productID + '&branch=all&executionID=' + executionID + '&module=0&extra=regionID=' + col.region + ',laneID=' + 0 + ',columnID=' + col.id), 'data-toggle': 'modal', 'data-size': 'lg'});
}
else if(col.type == 'wait')