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

* Splict build search form function.

Browse Source
This commit is contained in:
daitingting
2023-08-29 05:55:39 +00:00
parent 482fafb2cb
commit a529227bf5
2 changed files with 56 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/control.php
+4 -24
View File
@@ -879,14 +879,8 @@ class testcase extends control
/* 构建搜索表单。*/
/* Build the search form. */
$queryID = ($browseType == 'bySearch') ? (int)$param : 0;
$actionURL = $this->createLink('testcase', 'linkCases', "caseID=$caseID&browseType=bySearch&queryID=myQueryID", '', true);
$objectID = 0;
if($this->app->tab == 'project') $objectID = $case->project;
if($this->app->tab == 'execution') $objectID = $case->execution;
unset($this->config->testcase->search['fields']['product']);
$this->testcase->buildSearchForm($case->product, $this->products, $queryID, $actionURL, $objectID);
$queryID = ($browseType == 'bySearch') ? (int)$param : 0;
$this->testcaseZen->buildLinkCasesSearchForm($case, $queryID);
/* 获取可关联的用例。*/
/* Get cases to link. */
@@ -930,22 +924,8 @@ class testcase extends control
/* 构建搜索表单。*/
/* Build the search form. */
$queryID = ($browseType == 'bySearch') ? (int)$param : 0;
$actionURL = $this->createLink('testcase', 'linkBugs', "caseID=$caseID&browseType=bySearch&queryID=myQueryID", '', true);
$objectID = 0;
if($this->app->tab == 'project') $objectID = $case->project;
if($this->app->tab == 'execution') $objectID = $case->execution;
/* 删除单一项目的计划字段。*/
/* Unset search field 'plan' in single project. */
unset($this->config->bug->search['fields']['product']);
if($case->project && ($this->app->tab == 'project' || $this->app->tab == 'execution'))
{
$project = $this->loadModel('project')->getByID($case->project);
if(!$project->hasProduct && $project->model == 'waterfall') unset($this->config->bug->search['fields']['plan']);
}
$this->bug->buildSearchForm($case->product, $this->products, $queryID, $actionURL, $objectID);
$queryID = ($browseType == 'bySearch') ? (int)$param : 0;
$this->testcaseZen->buildLinkBugsSearchForm($case, $queryID);
/* 获取关联的bug。*/
/* Get bugs to link. */
module/testcase/zen.php
+52 -4
View File
@@ -1268,12 +1268,12 @@ class testcaseZen extends testcase
* 处理评审数据。
* Prepare review data.
*
* @param int $caseID
* @param object $oldCase
* @param int $caseID
* @param object $oldCase
* @access protected
* @return void
* @return bool|object
*/
protected function prepareReviewData(int $caseID, object $oldCase)
protected function prepareReviewData(int $caseID, object $oldCase): bool|object
{
$now = helper::now();
$status = $this->testcase->getStatus('review', $oldCase);
@@ -1295,4 +1295,52 @@ class testcaseZen extends testcase
return $this->loadModel('file')->processImgURL($case, $this->config->testcase->editor->review['id'], $this->post->uid);
}
/**
* 构建关联用例页面的搜索表单。
* Build search form for link cases.
*
* @param object $case
* @param int $queryID
* @access protected
* @return void
*/
protected function buildLinkCasesSearchForm(object $case, int $queryID): void
{
$actionURL = $this->createLink('testcase', 'linkCases', "caseID={$case->id}&browseType=bySearch&queryID=myQueryID", '', true);
$objectID = 0;
if($this->app->tab == 'project') $objectID = $case->project;
if($this->app->tab == 'execution') $objectID = $case->execution;
unset($this->config->testcase->search['fields']['product']);
$this->testcase->buildSearchForm($case->product, $this->products, $queryID, $actionURL, $objectID);
}
/**
* 构建关联 bug 页面的搜索表单。
* Build search form for link bugs.
*
* @param object $case
* @param int $queryID
* @access protected
* @return void
*/
protected function buildLinkBugsSearchForm(object $case, int $queryID): void
{
$actionURL = $this->createLink('testcase', 'linkBugs', "caseID={$case->id}&browseType=bySearch&queryID=myQueryID", '', true);
$objectID = 0;
if($this->app->tab == 'project') $objectID = $case->project;
if($this->app->tab == 'execution') $objectID = $case->execution;
/* 删除单一项目的计划字段。*/
/* Unset search field 'plan' in single project. */
unset($this->config->bug->search['fields']['product']);
if($case->project && ($this->app->tab == 'project' || $this->app->tab == 'execution'))
{
$project = $this->loadModel('project')->getByID($case->project);
if(!$project->hasProduct && $project->model == 'waterfall') unset($this->config->bug->search['fields']['plan']);
}
$this->bug->buildSearchForm($case->product, $this->products, $queryID, $actionURL, $objectID);
}
}