* Fix bug #42183.
This commit is contained in:
@@ -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¶m=$param&caseType=$caseType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID&projectID=$projectID");
|
||||
}
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -586,6 +586,7 @@ class testcaseZen extends testcase
|
||||
|
||||
$this->view->switcherParams = "projectID={$projectID}&productID={$productID}¤tMethod=testcase";
|
||||
$this->view->switcherText = zget($productPairs, $productID, $this->lang->product->all);
|
||||
$this->view->project = $this->loadModel('project')->getByID($projectID);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user