From 1eb7ed4198daf0cafb21050acbf69ece2588f937 Mon Sep 17 00:00:00 2001
From: liugang <liugang@cnezsoft.com>
Date: Wed, 20 Jun 2018 14:11:52 +0800
Subject: [PATCH] * Finish task #4461.

---
 module/bug/js/browse.js      |  1 -
 module/bug/model.php         |  4 ++--
 module/common/model.php      | 11 ++++++++++-
 module/custom/control.php    |  4 +++-
 module/testcase/js/browse.js |  1 -
 module/testtask/js/browse.js |  1 -
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/module/bug/js/browse.js b/module/bug/js/browse.js
index 042da561a1..c48f4edd06 100644
--- a/module/bug/js/browse.js
+++ b/module/bug/js/browse.js
@@ -4,7 +4,6 @@ $(function()
 
     if(flow == 'onlyTest')
     {
-        $('#subNavbar > .nav > li').removeClass('active');
         $('#subNavbar > .nav > li[data-id=' + browseType + ']').addClass('active');
 
         var navWidth = $('#subNavbar > .nav').width();
diff --git a/module/bug/model.php b/module/bug/model.php
index 17354c1295..fc6552a47f 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -104,10 +104,10 @@ class bugModel extends model
             {
                 $moreKey   = 'more';
                 $moreLabel = $this->lang->more;
-                if(strpos(",unconfirmed,assigntonull,longlifebugs,postponedbugs,overduebugs,needconfirm,", ",$browseType,") !== false)
+                if(isset($this->lang->bug->moreSelects[$browseType]))
                 {
                     $moreKey   = $browseType;
-                    $moreLabel = $this->lang->bug->featureBar['browse'][$browseType];
+                    $moreLabel = $this->lang->bug->moreSelects[$browseType];
                 }
                 $more  = "<a data-toggle='dropdown'>{$moreLabel}<span class='caret'></span></a>";
                 $more .= "<ul class='dropdown-menu'>";
diff --git a/module/common/model.php b/module/common/model.php
index 12a14ae55a..72c5c8c595 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -442,7 +442,7 @@ class commonModel extends model
      */
     public static function printModuleMenu($moduleName)
     {
-        global $lang, $app;
+        global $config, $lang, $app;
 
         if(!isset($lang->$moduleName->menu))
         {
@@ -489,6 +489,15 @@ class commonModel extends model
                 }
                 if($module == $currentModule and ($method == $currentMethod or strpos(",$alias,", ",$currentMethod,") !== false)) $active = 'active';
 
+                /* Avoid user thinking the page is shaking when the menu toggle class 'active' */
+                if($config->global->flow == 'onlyTest')
+                {
+                    if($currentModule == 'bug'       && $currentMethod == 'browse')  $active = '';
+                    if($currentModule == 'testcase'  && $currentMethod == 'browse')  $active = '';
+                    if($currentModule == 'testtask'  && $currentMethod == 'browse')  $active = '';
+                    if($currentModule == 'testsuite' && $currentMethod == 'library') $active = '';
+                }
+
                 $menuItemHtml = "<li class='$class $active' data-id='$menuItem->name'>" . html::a($link, $menuItem->text, $target) . "</li>\n";
                 if($isMobile) $menuItemHtml = html::a($link, $menuItem->text, $target, "class='$class $active'") . "\n";
                 echo $menuItemHtml;
diff --git a/module/custom/control.php b/module/custom/control.php
index 1d7eaa288b..eff3639037 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -407,7 +407,9 @@ class custom extends control
      */
     public function ajaxGetMenu($module = 'main', $method = '', $type = '')
     {
-        $this->loadModel('project')->setMenu(array(), 0);
+        if($this->config->global->flow == 'full')     $this->loadModel('project')->setMenu(array(), 0);
+        if($this->config->global->flow == 'onlyTest') $this->loadModel('testcase')->setMenu(array(), 0);
+        if($this->config->global->flow == 'onlyTask') $this->loadModel('project')->setMenu(array(), 0);
         if($type === 'all')
         {
             $menu = array();
diff --git a/module/testcase/js/browse.js b/module/testcase/js/browse.js
index f8bede6792..692513e229 100644
--- a/module/testcase/js/browse.js
+++ b/module/testcase/js/browse.js
@@ -17,7 +17,6 @@ $(function()
 
     if(flow == 'onlyTest')
     {
-        $('#subNavbar > .nav > li').removeClass('active');
         $('#subNavbar > .nav > li[data-id=' + browseType + ']').addClass('active');
     }
 });
diff --git a/module/testtask/js/browse.js b/module/testtask/js/browse.js
index ab796a3216..9763d8f082 100644
--- a/module/testtask/js/browse.js
+++ b/module/testtask/js/browse.js
@@ -2,7 +2,6 @@ $(document).ready(function()
 {
     if(flow == 'onlyTest')
     {
-        $('#subNavbar > .nav > li').removeClass('active');
         $('#subNavbar > .nav > li[data-id=' + status + ']').addClass('active');
     }
 });