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

* testcase: use the type property of product instead of the currentProductType variable in session.

Browse Source
This commit is contained in:
liugang
2023-11-08 09:58:52 +08:00
parent cc4c4a1f94
commit 3c8b482db9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/ui/browse.html.php
+2 -2
View File
@@ -20,7 +20,7 @@ $canBatchReview = hasPriv('testcase', 'batchReview') && !$isOnlyScen
$canBatchDelete = hasPriv('testcase', 'batchDelete') && !$isOnlyScene;
$canBatchChangeType = hasPriv('testcase', 'batchChangeType') && !$isOnlyScene;
$canBatchConfirmStoryChange = hasPriv('testcase', 'batchConfirmStoryChange') && !$isOnlyScene;
$canBatchChangeBranch = hasPriv('testcase', 'batchChangeBranch') && !$isOnlyScene && $this->session->currentProductType && $this->session->currentProductType != 'normal';
$canBatchChangeBranch = hasPriv('testcase', 'batchChangeBranch') && !$isOnlyScene && $product->type != 'normal';
$canBatchChangeModule = hasPriv('testcase', 'batchChangeModule') && !empty($productID) && ($product->type == 'normal' || $branch !== 'all');
$canBatchChangeScene = hasPriv('testcase', 'batchChangeScene') && !$isOnlyScene;
$canImportToLib = hasPriv('testcase', 'importToLib') && !$isOnlyScene;
@@ -83,7 +83,7 @@ $footToolbar = $canBatchAction ? array('items' => array
$canBatchEdit ? array('text' => $lang->edit, 'className' => 'batch-btn secondary not-open-url', 'data-url' => helper::createLink('testcase', 'batchEdit', "productID=$caseProductID&branch=$branch")) : null,
!empty($navActions) ? array('caret' => 'up', 'className' => 'secondary', 'items' => $navActions, 'data-placement' => 'top-start') : null,
)) : null,
$canBatchChangeBranch ? array('caret' => 'up', 'text' => $lang->product->branchName[$this->session->currentProductType], 'type' => 'dropdown', 'items' => $branchItems, 'data-placement' => 'top-start') : null,
$canBatchChangeBranch ? array('caret' => 'up', 'text' => $lang->product->branchName[$product->type], 'type' => 'dropdown', 'items' => $branchItems, 'data-placement' => 'top-start') : null,
$canBatchChangeModule ? array('caret' => 'up', 'text' => $lang->testcase->moduleAB, 'type' => 'dropdown', 'items' => $moduleItems, 'data-placement' => 'top-start') : null,
$canBatchChangeScene ? array('caret' => 'up', 'text' => $lang->testcase->scene, 'type' => 'dropdown', 'items' => $sceneItems, 'data-placement' => 'top-start') : null,
$canImportToLib ? array('text' => $lang->testcase->importToLib, 'data-toggle' => 'modal', 'data-target' => '#importToLib', 'data-size' => 'sm') : null,
module/testcase/zen.php
+2 -2
View File
@@ -2365,7 +2365,8 @@ class testcaseZen extends testcase
$this->config->testcase->search['params']['scene']['values'] = $this->testcase->getSceneMenu($productID, $moduleID, $branch, 0, 0, true);
$this->config->testcase->search['params']['lib']['values'] = $this->loadModel('caselib')->getLibraries();
if($this->session->currentProductType == 'normal' || $this->app->tab == 'project')
$product = $this->loadModel('product')->fetchByID($productID);
if($product->type == 'normal' || $this->app->tab == 'project')
{
unset($this->config->testcase->search['fields']['branch']);
unset($this->config->testcase->search['params']['branch']);
@@ -2373,7 +2374,6 @@ class testcaseZen extends testcase
else
{
$this->app->loadLang('branch');
$product = $this->loadModel('product')->getByID($productID);
$branches = $this->loadModel('branch')->getPairs($productID, '', $projectID);
$branches = array('') + array('0' => $this->lang->branch->main) + $branches + array('all' => $this->lang->branch->all);