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

* Add section comment.

Browse Source
This commit is contained in:
daitingting
2023-08-29 05:30:49 +00:00
parent c15cb2b5b1
commit a8ccb237ca
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/control.php
+20 -17
View File
@@ -879,12 +879,11 @@ class testcase extends control
/* 构建搜索表单。*/
/* Build the search form. */
$objectID = 0;
if($this->app->tab == 'project') $objectID = $case->project;
if($this->app->tab == 'execution') $objectID = $case->execution;
$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);
@@ -911,6 +910,7 @@ class testcase extends control
}
/**
* 关联相关 bug。
* Link related bugs.
*
* @param int $caseID
@@ -922,33 +922,36 @@ class testcase extends control
* @access public
* @return void
*/
public function linkBugs($caseID, $browseType = '', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
public function linkBugs(int $caseID, string $browseType = '', int $param = 0, int $recTotal = 0, int $recPerPage = 20, int $pageID = 1)
{
$this->loadModel('bug');
/* Get case and queryID. */
$case = $this->testcase->getById($caseID);
$queryID = ($browseType == 'bySearch') ? (int)$param : 0;
$case = $this->testcase->getByID($caseID);
/* 构建搜索表单。*/
/* 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 and ($this->app->tab == 'project' or $this->app->tab == 'execution'))
if($case->project && ($this->app->tab == 'project' || $this->app->tab == 'execution'))
{
$project = $this->loadModel('project')->getById($case->project);
if(!$project->hasProduct and $project->model == 'waterfall') unset($this->config->bug->search['fields']['plan']);
$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);
/* Get cases to link. */
/* 获取关联的bug。*/
/* Get bugs to link. */
$bugs2Link = $this->testcase->getBugs2Link($caseID, $browseType, $queryID);
/* bug 分页。*/
/* Pager. */
$this->app->loadClass('pager', true);
$recTotal = count($bugs2Link);
@@ -956,11 +959,11 @@ class testcase extends control
$bugs2Link = array_chunk($bugs2Link, $pager->recPerPage);
/* Assign. */
$this->view->title = $this->lang->testcase->linkBugs;
$this->view->case = $case;
$this->view->bugs2Link = empty($bugs2Link) ? $bugs2Link : $bugs2Link[$pageID - 1];
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->pager = $pager;
$this->view->title = $this->lang->testcase->linkBugs;
$this->view->case = $case;
$this->view->bugs2Link = empty($bugs2Link) ? $bugs2Link : $bugs2Link[$pageID - 1];
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->pager = $pager;
$this->display();
}
module/testcase/ui/edit.html.php
+2
View File
@@ -325,6 +325,7 @@ detailBody
(
set::href(createLink('testcase', 'linkCases', "caseID={$case->id}")),
set('data-toggle', 'modal'),
set('data-size', 'lg'),
$lang->testcase->linkCases,
)
) : null,
@@ -346,6 +347,7 @@ detailBody
(
set::href(createLink('testcase', 'linkBugs', "caseID={$case->id}")),
set('data-toggle', 'modal'),
set('data-size', 'lg'),
$lang->testcase->linkBugs,
)
) : null,