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

* Add the branch switcher in tree browse page.

Browse Source
This commit is contained in:
hufangzhou
2021-11-25 12:22:56 +08:00
parent fb8ff15c2a
commit e431847c58
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/filter.php
-1
View File
@@ -207,7 +207,6 @@ $filter->api->edit->get['libID'] = 'int';
$filter->api->edit->get['module'] = 'int';
$filter->api->edit->get['apiID'] = 'int';
$filter->file->download->cookie[$config->sessionVar] = 'code';
$filter->mail->ztcloud->cookie['ztCloudLicense'] = 'equal::yes';
module/product/model.php
+2 -1
View File
@@ -533,7 +533,8 @@ class productModel extends model
$notNormalProduct = (isset($currentProduct->type) and $currentProduct->type != 'normal');
$isTrackMethod = ($currentModule == 'story' and $currentMethod == 'track');
$isShowBranchMethod = (strpos($this->config->product->showBranchMethod, $currentMethod) !== false and $currentModule == 'product') || $isTrackMethod;
$isTreeBrowseMethod = ($currentModule == 'tree' and $currentMethod == 'browse');
$isShowBranchMethod = (strpos($this->config->product->showBranchMethod, $currentMethod) !== false and $currentModule == 'product') || $isTrackMethod || $isTreeBrowseMethod;
if($notNormalProduct and strpos(',testsuite,testreport,', ',' . $currentModule . ',') === false and ($this->app->tab == 'qa' or $isShowBranchMethod))
{
$this->lang->product->branch = sprintf($this->lang->product->branch, $this->lang->product->branchName[$currentProduct->type]);
module/tree/control.php
+1 -1
View File
@@ -31,7 +31,7 @@ class tree extends control
if($this->app->tab == 'product')
{
$this->product->setMenu($rootID, 0, 0, '', $viewType);
$this->product->setMenu($rootID, $branch, 0, '', $viewType);
}
else if($this->app->tab == 'qa' and $viewType != 'caselib')
{