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

[bug#52324,1h] unify project bug and testcase serach product field.

Browse Source
This commit is contained in:
songchenxuan
2024-08-20 15:06:54 +08:00
committed by 周鑫
parent 2e10d8e6be
commit 92bca35d04
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/zen.php
+13 -3
View File
@@ -2478,12 +2478,22 @@ class testcaseZen extends testcase
/* 获取产品列表。Get productList. */
if($this->app->tab == 'project' && !$productID)
{
$productList = $products;
if($projectID)
{
$products = $this->loadModel('product')->getProducts($projectID);
$productList = array(0 => '');
foreach($products as $product) $productList[$product->id] = $product->name;
$productList['all'] = $this->lang->product->allProductsOfProject;
}
else
{
$productList = $products;
}
$this->config->testcase->search['params']['story']['values'] = $this->loadModel('story')->getExecutionStoryPairs($projectID, 0, 'all', $moduleID, 'full', 'active');
}
else
{
$productList = array();
$productList = array(0 => '');
$productList['all'] = $this->lang->all;
if(isset($products[$productID])) $productList[$productID] = $products[$productID];
$this->config->testcase->search['params']['story']['values'] = $this->loadModel('story')->getProductStoryPairs($productID, $branch, array(), 'active,reviewing', 'id_desc', 0, '', 'story', false);
@@ -2501,7 +2511,7 @@ class testcaseZen extends testcase
foreach($products as $id => $name) $modules += $this->loadModel('tree')->getOptionMenu($id, 'case', 0);
}
$this->config->testcase->search['params']['product']['values'] = array('') + $productList;
$this->config->testcase->search['params']['product']['values'] = $productList;
$this->config->testcase->search['params']['module']['values'] = $modules;
$this->config->testcase->search['params']['scene']['values'] = $this->testcase->getSceneMenu($productID, $moduleID, $branch, 0, 0, true);
$this->config->testcase->search['params']['lib']['values'] = $this->loadModel('caselib')->getLibraries();