From bb7b76e80323d97301349ecee4d211c24cea193e Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 18 May 2018 10:27:06 +0800
Subject: [PATCH]  * adjust for only test.

---
 module/bug/js/browse.js                   | 20 +++++++++-----------
 module/common/lang/en.php                 |  2 +-
 module/common/lang/zh-cn.php              |  2 +-
 module/testcase/js/browse.js              |  8 +++-----
 module/tree/view/ajaxgetdropmenu.html.php |  5 +++++
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/module/bug/js/browse.js b/module/bug/js/browse.js
index 9e704131eb..07b9ece2ef 100644
--- a/module/bug/js/browse.js
+++ b/module/bug/js/browse.js
@@ -1,36 +1,34 @@
-$(document).ready(function()
+$(function()
 {
     if(browseType == 'bysearch') ajaxGetSearchForm();
     if($('#bugList thead th.w-title').width() < 150) $('#bugList thead th.w-title').width(150);
 
     if(flow == 'onlyTest')
     {
-        $('#modulemenu > .nav').append($('#featurebar > .submenu').html());
         toggleSearch();
-
         $(".export").modalTrigger({width:650, type:'iframe'});
 
-        $('#modulemenu > .nav > li').removeClass('active');
-        $('#modulemenu > .nav > li[data-id=' + browseType + ']').addClass('active');
+        $('#subNavbar > .nav > li').removeClass('active');
+        $('#subNavbar > .nav > li[data-id=' + browseType + ']').addClass('active');
 
-        var navWidth = $('#modulemenu > .nav').width();
+        var navWidth = $('#subNavbar > .nav').width();
         var leftWidth  = 0;
         var rightWidth = 0;
 
-        $rightNav = $('#modulemenu > .nav > li.right');
+        $rightNav = $('#subNavbar > .nav > li.right');
         rightLength = $rightNav.length;
         for(i = 0; i < rightLength; i++) rightWidth += $rightNav.eq(i).width();
 
-        var maxWidth = navWidth - $('#modulemenu > .nav > #bysearchTab').width() - rightWidth - 100;
+        var maxWidth = navWidth - $('#subNavbar > .nav > #bysearchTab').width() - rightWidth - 100;
 
-        $('#modulemenu > .nav > li:not(.right)').each(function()
+        $('#subNavbar > .nav > li:not(.right)').each(function()
         {
             if(leftWidth > maxWidth)
             {
                 if($(this).attr('id') != 'moreMenus' && $(this).attr('id') != 'bysearchTab')
                 {
-                    $('#moreMenus').removeClass('hidden');
-                    $('#moreMenus > ul').append($(this)[0]);
+                    $('#subNavbar').removeClass('hidden');
+                    $('#subNavbar > ul').append($(this)[0]);
                 }
             }
             else
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 5fffaea4f4..3202635893 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -244,7 +244,7 @@ $lang->project->subMenu->list->tree      = 'Tree View|project|tree|projectID=%s'
 $lang->project->subMenu->qa = new stdclass();
 $lang->project->subMenu->qa->bug      = 'Bug|project|bug|projectID=%s';
 $lang->project->subMenu->qa->build    = array('link' => 'Build|project|build|projectID=%s', 'subModule' => 'build');
-$lang->project->subMenu->qa->testtask = array('link' => 'Test Task|project|testtask|projectID=%s', 'subModule' => 'testreport');
+$lang->project->subMenu->qa->testtask = array('link' => 'Test Task|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask');
 
 $lang->project->subMenu->action = new stdclass();
 $lang->project->subMenu->action->dynamic  = 'Dynamic|project|dynamic|projectID=%s';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index d2972083e9..acadfbb153 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -244,7 +244,7 @@ $lang->project->subMenu->list->tree      = '树状图|project|tree|projectID=%s'
 $lang->project->subMenu->qa = new stdclass();
 $lang->project->subMenu->qa->bug      = 'Bug|project|bug|projectID=%s';
 $lang->project->subMenu->qa->build    = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build');
-$lang->project->subMenu->qa->testtask = array('link' => '测试单|project|testtask|projectID=%s', 'subModule' => 'testreport');
+$lang->project->subMenu->qa->testtask = array('link' => '测试单|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask');
 
 $lang->project->subMenu->action = new stdclass();
 $lang->project->subMenu->action->dynamic  = '动态|project|dynamic|projectID=%s';
diff --git a/module/testcase/js/browse.js b/module/testcase/js/browse.js
index 8314bf1fb0..665a02bfb2 100644
--- a/module/testcase/js/browse.js
+++ b/module/testcase/js/browse.js
@@ -21,20 +21,18 @@ function confirmBatchDelete(actionLink)
     return false;
 }
 
-$(document).ready(function()
+$(function()
 {
     if(browseType == 'bysearch') ajaxGetSearchForm();
     if($('#caseList thead th.w-title').width() < 150) $('#caseList thead th.w-title').width(150);
 
     if(flow == 'onlyTest')
     {
-        $('#modulemenu > .nav').append($('#mainMenu > .pull-left.btn-toolbar').html());
-
         toggleSearch();
         $('.export').modalTrigger({width:650, type:'iframe', afterShown: setCheckedCookie})
 
-        $('#modulemenu > .nav > li').removeClass('active');
-        $('#modulemenu > .nav > li[data-id=' + browseType + ']').addClass('active');
+        $('#subNavbar > .nav > li').removeClass('active');
+        $('#subNavbar > .nav > li[data-id=' + browseType + ']').addClass('active');
     }
 });
 
diff --git a/module/tree/view/ajaxgetdropmenu.html.php b/module/tree/view/ajaxgetdropmenu.html.php
index 199b24fecd..67a1cdd893 100644
--- a/module/tree/view/ajaxgetdropmenu.html.php
+++ b/module/tree/view/ajaxgetdropmenu.html.php
@@ -6,6 +6,11 @@
   <?php
   foreach($modules as $moduleID => $module)
   {
+      if(empty($module))
+      {
+          $module = '/';
+          $modulesPinyin[$module] = '';
+      }
       echo html::a(sprintf($link, $productID, $moduleID), $module, '', "data-key='{$modulesPinyin[$module]}'");
   }
   ?>