This commit is contained in:
tianshujie
2023-12-22 15:14:36 +08:00
parent c66e77e520
commit 843c1f27ce
3 changed files with 8 additions and 2 deletions
+6 -1
View File
@@ -854,7 +854,12 @@ class project extends control
{
/* 项目型项目不展示2.5级产品下拉菜单。 */
$project = $this->project->getByID($projectID);
if(!$project->hasProduct) $this->config->excludeSwitcherList[] = 'project-testcase';
if(!$project->hasProduct)
{
$this->config->excludeSwitcherList[] = 'project-testcase';
$productPairs = $this->loadModel('product')->getProductPairsByProject($projectID);
$productID = key($productPairs);
}
echo $this->fetch('testcase', 'browse', "productID=$productID&branch=$branch&browseType=$browseType&param=$param&caseType=$caseType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID&projectID=$projectID");
}
+1 -1
View File
@@ -29,7 +29,7 @@ $product = is_bool($product) ? new stdclass() : $product;
$canModify = common::canModify('product', $product);
$canSwitchCaseType = $this->app->tab == 'qa';
$canDisplaySuite = $this->app->tab == 'qa' && $rawMethod != 'browseunits';
$canManageModule = hasPriv('tree', 'browse') && !empty($productID);
$canManageModule = hasPriv('tree', 'browse') && !empty($productID) && (!isset($project) || $project->hasProduct);
$canCreateSuite = hasPriv('testsuite', 'create');
$canBrowseUnits = hasPriv('testtask', 'browseunits');
$canBrowseZeroCase = hasPriv('testcase', 'zerocase') && $rawMethod != 'browseunits';
+1
View File
@@ -586,6 +586,7 @@ class testcaseZen extends testcase
$this->view->switcherParams = "projectID={$projectID}&productID={$productID}&currentMethod=testcase";
$this->view->switcherText = zget($productPairs, $productID, $this->lang->product->all);
$this->view->project = $this->loadModel('project')->getByID($projectID);
}
}