Merge branch 'sprint/devplat_30' into 'master'

Sprint/devplat 30

See merge request easycorp/zentaopms!4767
This commit is contained in:
王怡栋
2022-08-04 01:15:36 +00:00
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -75,7 +75,7 @@ class testsuite extends control
$sort = common::appendOrder($orderBy);
$productName = isset($this->products[$productID]) ? $this->products[$productID] : '';
$suites = $this->testsuite->getSuites($productID, $sort, $pager);
$suites = $this->testsuite->getSuites($productID, $sort, $pager, $type);
if(empty($suites) and $pageID > 1)
{
$pager = pager::init(0, $recPerPage, 1);
+1
View File
@@ -99,6 +99,7 @@ class testsuiteModel extends model
->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testsuite != 'qa')->andWhere('project')->eq($this->session->project)->fi()
->andWhere('deleted')->eq(0)
->beginIF(strpos($param, 'all') === false)->andWhere("(`type` = 'public' OR (`type` = 'private' and addedBy = '{$this->app->user->account}'))")->fi()
->beginIF(strpos($param, 'review') !== false)->andWhere("FIND_IN_SET('{$this->app->user->account}', `reviewers`)")->fi()
->orderBy($orderBy)
->page($pager)
->fetchAll('id');