From 9095c54d37d1d2eabc60764fed47aeaf4c80030e Mon Sep 17 00:00:00 2001 From: daitingting Date: Tue, 14 Jan 2025 09:15:44 +0000 Subject: [PATCH] * [task#136554,doing,0,5h] Do not limit project if it is from document. --- module/caselib/control.php | 2 +- module/caselib/model.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/module/caselib/control.php b/module/caselib/control.php index 0d1253fe43..1887092097 100644 --- a/module/caselib/control.php +++ b/module/caselib/control.php @@ -180,7 +180,7 @@ class caselib extends control /* Save query session .*/ $sort = common::appendOrder($orderBy); - $cases = $this->caselib->getLibCases($libID, $browseType, (int)$queryID, $moduleID, $sort, $pager); + $cases = $this->caselib->getLibCases($libID, $browseType, (int)$queryID, $moduleID, $sort, $pager, $from); $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', true); $this->loadModel('testcase'); diff --git a/module/caselib/model.php b/module/caselib/model.php index a5aba55c00..52cfa33db2 100644 --- a/module/caselib/model.php +++ b/module/caselib/model.php @@ -223,10 +223,11 @@ class caselibModel extends model * @param int $moduleID * @param string $sort * @param object $pager + * @param string $from * @access public * @return array */ - public function getLibCases(int $libID, string $browseType, int $queryID = 0, int $moduleID = 0, string $sort = 'id_desc', object $pager = null): array + public function getLibCases(int $libID, string $browseType, int $queryID = 0, int $moduleID = 0, string $sort = 'id_desc', object $pager = null, string $from = 'qa'): array { $browseType = $browseType == 'bymodule' && $this->session->libBrowseType && $this->session->libBrowseType != 'bysearch' ? $this->session->libBrowseType : $browseType; @@ -266,7 +267,7 @@ class caselibModel extends model ->andWhere('deleted')->eq('0') ->andWhere($caseQuery) ->beginIF($queryLibID != 'all')->andWhere('lib')->eq($libID)->fi() - ->beginIF($this->app->tab != 'qa')->andWhere('project')->eq($this->session->project)->fi(); + ->beginIF($this->app->tab != 'qa' && $from != 'doc')->andWhere('project')->eq($this->session->project)->fi(); } else {