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

* Add story pairs to search form.

Browse Source
This commit is contained in:
sunguangming
2024-04-24 14:56:11 +08:00
parent 2c062163a5
commit 0562ebb542
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+1 -1
View File
@@ -626,7 +626,7 @@ class execution extends control
/* Build the search form. */
$actionURL = $this->createLink('execution', 'testcase', "executionID=$executionID&productID=$productID&branchID=$branchID&type=bysearch&queryID=myQueryID&moduleID=0&orderBy=$orderBy");
$this->execution->buildCaseSearchForm($products, $param, $actionURL);
$this->execution->buildCaseSearchForm($products, $param, $actionURL, $executionID);
$this->executionZen->assignTestcaseVars($executionID, $productID, $branchID, $moduleID, $orderBy, $type, $pager);
module/execution/model.php
+3 -1
View File
@@ -4004,10 +4004,11 @@ class executionModel extends model
* @param array $products
* @param int $queryID
* @param string $actionURL
* @param int $executionID
* @access public
* @return void
*/
public function buildCaseSearchForm(array $products, int $queryID, string $actionURL)
public function buildCaseSearchForm(array $products, int $queryID, string $actionURL, int $executionID)
{
$modules = array();
foreach($products as $product)
@@ -4066,6 +4067,7 @@ class executionModel extends model
$this->config->testcase->search['params']['branch']['values'] = $branchPairs;
}
$this->config->testcase->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $this->lang->testcase->statusList);
$this->config->testcase->search['params']['story']['values'] = $this->loadModel('story')->getExecutionStoryPairs($executionID);
$this->loadModel('search')->setSearchParams($this->config->testcase->search);
}
module/testcase/zen.php
+2
View File
@@ -2421,12 +2421,14 @@ class testcaseZen extends testcase
if($this->app->tab == 'project' && !$productID)
{
$productList = $products;
$this->config->testcase->search['params']['story']['values'] = $this->loadModel('story')->getExecutionStoryPairs($projectID, 0, 'all', $moduleID, 'full', 'active');
}
else
{
$productList = array();
$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);
}
/* 获取模块列表。*/