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

* Adjust testreport module.

Browse Source
This commit is contained in:
leiyong
2021-03-29 18:25:15 +08:00
parent 905868cc2d
commit cf6f149d6a
9 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/control.php
+5 -1
View File
@@ -884,7 +884,11 @@ class testtask extends control
}
$this->send($response);
}
die(js::locate(inlink('browse', "product=$task->product"), 'parent'));
$browseList = $this->createLink('testtask', 'browse', "productID=$task->product");
if($this->app->openApp == 'execution') $browseList = $this->createLink('execution', 'testtask', "executionID=$task->execution");
if($this->app->openApp == 'project') $browseList = $this->createLink('project', 'testtask', "projectID=$task->project");
die(js::locate($browseList, 'parent'));
}
}
module/testtask/model.php
-1
View File
@@ -72,7 +72,6 @@ class testtaskModel extends model
->leftJoin(TABLE_PROJECTPRODUCT)->alias('t5')->on('t1.execution = t5.project and t1.product = t5.product')
->where('t1.deleted')->eq(0)
->beginIF($this->config->systemMode == 'new' and $this->app->openApp != 'qa')->andWhere('t1.project')->eq($this->session->project)->fi()
->andWhere('t1.auto')->ne('unit')
->beginIF(!$this->app->user->admin)->andWhere('t3.id')->in("0,{$this->app->user->view->sprints}")->fi()
->beginIF($scopeAndStatus[0] == 'local')->andWhere('t1.product')->eq((int)$productID)->fi()