From 822a06ae5640410b0e156bc1680705e8a2d0a35e Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Tue, 23 Mar 2021 10:12:25 +0800 Subject: [PATCH] * Finish task #36892. --- module/caselib/model.php | 7 +++++-- module/qa/config.php | 3 ++- module/qa/lang/de.php | 1 - module/qa/lang/en.php | 1 - module/qa/lang/fr.php | 1 - module/qa/lang/vi.php | 1 - module/qa/lang/zh-cn.php | 1 - module/qa/model.php | 3 ++- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/module/caselib/model.php b/module/caselib/model.php index b7ffc352a4..bf0a788fe7 100644 --- a/module/caselib/model.php +++ b/module/caselib/model.php @@ -23,10 +23,13 @@ class caselibModel extends model */ public function setLibMenu($libraries, $libID, $moduleID = 0) { + /* Set case lib menu. */ + $this->loadModel('qa')->setMenu($this->loadModel('product')->getPairs(), $this->session->product); + $currentLibName = zget($libraries, $libID, ''); - $isMobile = $this->app->viewType == 'mhtml'; - $selectHtml = ''; + $isMobile = $this->app->viewType == 'mhtml'; + $selectHtml = ''; if(!empty($libraries)) { if($isMobile) diff --git a/module/qa/config.php b/module/qa/config.php index b85214fb7b..2077db491c 100644 --- a/module/qa/config.php +++ b/module/qa/config.php @@ -1,2 +1,3 @@ qa->menuList = array('caselib', 'testreport', 'testsuite', 'testtask', 'testcase', 'bug', 'qa', 'automation'); +$config->qa->menuList = array('caselib', 'testreport', 'testsuite', 'testtask', 'testcase', 'bug', 'qa', 'automation'); +$config->qa->noDropMenuModule = array('qa', 'caselib', 'automation'); diff --git a/module/qa/lang/de.php b/module/qa/lang/de.php index 0e9e094ac1..fc00b08d71 100644 --- a/module/qa/lang/de.php +++ b/module/qa/lang/de.php @@ -9,5 +9,4 @@ * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->qa->common = 'QS'; $lang->qa->index = 'QS Home'; diff --git a/module/qa/lang/en.php b/module/qa/lang/en.php index 4ff765c054..0e68d1444d 100644 --- a/module/qa/lang/en.php +++ b/module/qa/lang/en.php @@ -9,5 +9,4 @@ * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->qa->common = 'QA'; $lang->qa->index = 'QA Home'; diff --git a/module/qa/lang/fr.php b/module/qa/lang/fr.php index 4ee94ec05b..93c46f893f 100644 --- a/module/qa/lang/fr.php +++ b/module/qa/lang/fr.php @@ -9,5 +9,4 @@ * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ * @link https://www.zentao.pm */ -$lang->qa->common = 'QA'; $lang->qa->index = 'Accueil Qualité'; diff --git a/module/qa/lang/vi.php b/module/qa/lang/vi.php index 12c04ec548..d91805fde6 100644 --- a/module/qa/lang/vi.php +++ b/module/qa/lang/vi.php @@ -9,5 +9,4 @@ * @version $Id: vi.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->qa->common = 'QA'; $lang->qa->index = 'Trang QA'; diff --git a/module/qa/lang/zh-cn.php b/module/qa/lang/zh-cn.php index 8e0e2683e6..831ba6a5ff 100644 --- a/module/qa/lang/zh-cn.php +++ b/module/qa/lang/zh-cn.php @@ -9,5 +9,4 @@ * @version $Id: zh-cn.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->qa->common = '测试视图'; $lang->qa->index = '测试主页'; diff --git a/module/qa/model.php b/module/qa/model.php index 2c4c83cc24..6414ae2993 100644 --- a/module/qa/model.php +++ b/module/qa/model.php @@ -38,7 +38,8 @@ class qaModel extends model $productIndex .= $selectHtml; } - if($this->app->rawModule != 'qa') $this->lang->switcherMenu = $this->product->getSwitcher($productID, $extra, $branch); + $this->lang->switcherMenu = "