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

* testcase: change showAutoCase to onlyAutoCase.

Browse Source
This commit is contained in:
liugang
2023-06-27 18:46:09 +08:00
parent 5b58602ba3
commit df75134321
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/filter.php
+3 -3
View File
@@ -301,7 +301,7 @@ $filter->project->task->cookie['windowWidth'] = 'int';
$filter->project->export->cookie['checkedItem'] = 'reg::checked';
$filter->project->execution->cookie['pagerExecutionAll'] = 'int';
$filter->project->execution->cookie['showTask'] = 'code';
$filter->project->testcase->cookie['showAutoCase'] = 'int';
$filter->project->testcase->cookie['onlyAutoCase'] = 'int';
$filter->projectstory->story->cookie['storyModuleParam'] = 'int';
$filter->projectstory->story->cookie['pagerProductBrowse'] = 'int';
@@ -336,13 +336,13 @@ $filter->execution->all->cookie['showExecutionBatchEdit'] = 'int';
$filter->testcase->browse->cookie['caseModule'] = 'int';
$filter->testcase->browse->cookie['caseSuite'] = 'int';
$filter->testcase->browse->cookie['preBranch'] = 'reg::word';
$filter->testcase->browse->cookie['showAutoCase'] = 'int';
$filter->testcase->browse->cookie['onlyAutoCase'] = 'int';
$filter->testcase->create->cookie['lastCaseModule'] = 'int';
$filter->testcase->default->cookie['lastProduct'] = 'int';
$filter->testcase->default->cookie['preProductID'] = 'int';
$filter->testcase->export->cookie['checkedItem'] = 'reg::checked';
$filter->testcase->groupcase->cookie['preBranch'] = 'reg::word';
$filter->testcase->groupcase->cookie['showAutoCase'] = 'int';
$filter->testcase->groupcase->cookie['onlyAutoCase'] = 'int';
$filter->testreport->default->cookie['lastProduct'] = 'int';
$filter->testreport->default->cookie['lastProject'] = 'int';
module/api/v1/entries/testcases.php
+1 -1
View File
@@ -36,7 +36,7 @@ class testcasesEntry extends entry
$this->app->cookie->caseModule = 0;
$this->app->cookie->caseSuite = 0;
$this->app->cookie->preBranch = $branch;
$this->app->cookie->showAutoCase = 1;
$this->app->cookie->onlyAutoCase = 0;
$control = $this->loadController('testcase', 'browse');
$control->browse($productID, $this->param('branch', ''), $type, $param, $this->param('caseType', ''), $this->param('order', 'id_desc'), 0, $this->param('limit', 20), $this->param('page', 1));
module/testcase/model.php
+4 -4
View File
@@ -219,7 +219,7 @@ class testcaseModel extends model
->beginIF($browseType == 'wait')->andWhere('t1.status')->eq($browseType)->fi()
->beginIF($auto == 'unit')->andWhere('t1.auto')->eq('unit')->fi()
->beginIF($auto != 'unit')->andWhere('t1.auto')->ne('unit')->fi()
->beginIF(!$this->cookie->showAutoCase)->andWhere('t1.auto')->ne('auto')->fi()
->beginIF($this->cookie->onlyAutoCase)->andWhere('t1.auto')->eq('auto')->fi()
->beginIF($caseType)->andWhere('t1.type')->eq($caseType)->fi()
->andWhere('t1.deleted')->eq('0')
->orderBy($orderBy)
@@ -257,7 +257,7 @@ class testcaseModel extends model
->beginIF($browseType == 'wait')->andWhere('t2.status')->eq($browseType)->fi()
->beginIF($auto == 'unit')->andWhere('t2.auto')->eq('unit')->fi()
->beginIF($auto != 'unit')->andWhere('t2.auto')->ne('unit')->fi()
->beginIF(!$this->cookie->showAutoCase)->andWhere('t2.auto')->ne('auto')->fi()
->beginIF($this->cookie->onlyAutoCase)->andWhere('t2.auto')->eq('auto')->fi()
->beginIF($caseType)->andWhere('t2.type')->eq($caseType)->fi()
->andWhere('t2.deleted')->eq('0')
->orderBy($orderBy)
@@ -495,7 +495,7 @@ class testcaseModel extends model
$modules = $moduleID ? $this->loadModel('tree')->getAllChildId($moduleID) : '0';
$browseType = ($browseType == 'bymodule' and $this->session->caseBrowseType and $this->session->caseBrowseType != 'bysearch') ? $this->session->caseBrowseType : $browseType;
$group = $this->lang->navGroup->testcase;
$auto = $this->cookie->showAutoCase ? 'auto' : $auto;
$auto = $this->cookie->onlyAutoCase ? 'auto' : $auto;
/* By module or all cases. */
$cases = array();
@@ -525,7 +525,7 @@ class testcaseModel extends model
->beginIF($modules)->andWhere('t1.module')->in($modules)->fi()
->beginIF($auto != 'unit')->andWhere('t1.auto')->ne('unit')->fi()
->beginIF($auto == 'unit')->andWhere('t1.auto')->eq('unit')->fi()
->beginIF(!$this->cookie->showAutoCase)->andWhere('t1.auto')->ne('auto')->fi()
->beginIF($this->cookie->onlyAutoCase)->andWhere('t1.auto')->eq('auto')->fi()
->beginIF($caseType)->andWhere('t1.type')->eq($caseType)->fi()
->orderBy($sort)
->page($pager, 't1.id')