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

Merge branch 'sprint/295_liumengyi_85648' into 'master'

Browse Source 
* Finish task #85648.

See merge request easycorp/zentaopms!7155
This commit is contained in:
孙广明
2023-03-09 01:33:19 +00:00
parent 4b10b5abeb e5c211bf86
commit a46387b590
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+9 -2
View File
@@ -1166,7 +1166,14 @@ class bug extends control
unset($productBugs[$bugID]);
$executions = array(0 => '') + $this->product->getExecutionPairsByProduct($bug->product, $bug->branch, 'id_desc', $bug->project);
if(!empty($bug->execution) and empty($executions[$bug->execution])) $executions[$execution->id] = $execution->name;
if(!empty($bug->execution) and empty($executions[$bug->execution])) $executions[$execution->id] = $execution->name . "({$this->lang->bug->deleted})";
$projects = array(0 => '') + $this->product->getProjectPairsByProduct($productID, $bug->branch);
if(!empty($bug->project) and empty($projects[$bug->project]))
{
$project = $this->loadModel('project')->getByID($bug->project);
$projects[$project->id] = $project->name . "({$this->lang->bug->deleted})";
}
if($product->shadow) $this->view->project = $this->loadModel('project')->getByShadowProduct($bug->product);
@@ -1176,7 +1183,7 @@ class bug extends control
$this->view->productBugs = $productBugs;
$this->view->productName = $this->products[$productID];
$this->view->plans = $this->loadModel('productplan')->getPairs($productID, $bug->branch, '', true);
$this->view->projects = array(0 => '') + $this->product->getProjectPairsByProduct($productID, $bug->branch, $bug->project);
$this->view->projects = $projects;
$this->view->projectExecutionPairs = $this->loadModel('project')->getProjectExecutionPairs();
$this->view->moduleOptionMenu = $moduleOptionMenu;
$this->view->currentModuleID = $currentModuleID;