From 5e267814d0db6eb2dc1c5a21830d48959708d04d Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 18 Aug 2017 15:15:55 +0800
Subject: [PATCH]  * finish task #3129.

---
 module/bug/view/browse.html.php          | 4 ++--
 module/testcase/control.php              | 1 +
 module/testcase/js/common.js             | 2 +-
 module/testcase/view/caseheader.html.php | 4 ++--
 module/testreport/model.php              | 2 +-
 module/testsuite/control.php             | 6 ++++++
 module/testtask/model.php                | 2 +-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index db00b0a83f..61cfed72b5 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -24,7 +24,7 @@ js::set('branch', $branch);
 <div id='featurebar'>
   <ul class='submenu hidden'>
     <li id='moreMenus' class='hidden'>
-      <a class='dropdown-toggle' data-toggle='dropdown'>
+      <a href='###' class='dropdown-toggle' data-toggle='dropdown'>
         <?php echo $lang->more;?> <span class='caret'></span>
       </a>
       <ul class='dropdown-menu right'>
@@ -54,7 +54,7 @@ js::set('branch', $branch);
       <?php common::printLink('bug', 'report', "productID=$productID&browseType=$browseType&branchID=$branch&moduleID=$moduleID", "<i class='icon-common-report icon-bar-chart'></i> " . $lang->bug->report->common); ?>
     </li>
     <li class='right'>
-      <a class='dropdown-toggle' data-toggle='dropdown'>
+      <a href='###' class='dropdown-toggle' data-toggle='dropdown'>
         <i class='icon-download-alt'></i> <?php echo $lang->export ?>
         <span class='caret'></span>
       </a>
diff --git a/module/testcase/control.php b/module/testcase/control.php
index a4f38bf34e..2dde1cac7d 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -565,6 +565,7 @@ class testcase extends control
             $libraries = $this->loadModel('testsuite')->getLibraries();
             $this->testsuite->setLibMenu($libraries, $case->lib);
             $this->lang->testcase->menu = $this->lang->testsuite->menu;
+            if($this->config->global->flow == 'onlyTest') $this->lang->menugroup->testcase = 'caselib';
 
             $title      = "CASE #$case->id $case->title - " . $libraries[$case->lib];
             $position[] = html::a($this->createLink('testsuite', 'library', "libID=$case->lib"), $libraries[$case->lib]);
diff --git a/module/testcase/js/common.js b/module/testcase/js/common.js
index 5d170fed28..0b72b9905e 100644
--- a/module/testcase/js/common.js
+++ b/module/testcase/js/common.js
@@ -109,7 +109,7 @@ function setStories()
     productID = $('#product').val();
     branch    = $('#branch').val();
     if(typeof(branch) == 'undefined') branch = 0;
-    link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branch + '&moduleID=' + moduleID + '&storyID=0&onlyOption=false&status=''&limit=50');
+    link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branch + '&moduleID=' + moduleID + '&storyID=0&onlyOption=false&status=&limit=50');
     $.get(link, function(stories)
     {
         var value = $('#story').val();
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index 6cbf1dbe6a..a89ea1c26c 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -38,7 +38,7 @@
     </li>
 
     <li class='pull-right'>
-      <a class='dropdown-toggle' data-toggle='dropdown' id='importAction'><i class='icon-upload-alt'></i> <?php echo $lang->import ?><span class='caret'></span></a>
+      <a href='###' class='dropdown-toggle' data-toggle='dropdown' id='importAction'><i class='icon-upload-alt'></i> <?php echo $lang->import ?><span class='caret'></span></a>
       <ul class='dropdown-menu' id='importActionMenu'>
       <?php 
       $misc = common::hasPriv('testcase', 'import') ? "class='export'" : "class=disabled";
@@ -53,7 +53,7 @@
     </li>
 
     <li class='pull-right'>
-      <a class='dropdown-toggle' data-toggle='dropdown'>
+      <a href='###' class='dropdown-toggle' data-toggle='dropdown'>
         <i class='icon-download-alt'></i> <?php echo $lang->export ?>
         <span class='caret'></span>
       </a>
diff --git a/module/testreport/model.php b/module/testreport/model.php
index 4dea9dadbe..00faf1d8f6 100644
--- a/module/testreport/model.php
+++ b/module/testreport/model.php
@@ -52,7 +52,7 @@ class testreportModel extends model
                     $viewName = $scope == 'local'? $products[$productID] : $this->lang->testtask->all;
 
                     $replace  = '<li>';
-                    $replace .= "<a data-toggle='dropdown'>{$viewName} <span class='caret'></span></a>";
+                    $replace .= "<a href='###' data-toggle='dropdown'>{$viewName} <span class='caret'></span></a>";
                     $replace .= "<ul class='dropdown-menu' style='max-height:240px;overflow-y:auto'>";
                     $replace .= "<li>" . html::a(helper::createLink('testtask', 'browse', "productID=$productID&branch=$branch&type=all,$status"), $this->lang->testtask->all) . "</li>";
                     $replace .= "<li>" . html::a(helper::createLink('testtask', 'browse', "productID=$productID&branch=$branch&type=local,$status"), $products[$productID]) . "</li>";
diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index 5b8a787fde..c16c5db8de 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -175,6 +175,7 @@ class testsuite extends control
         if($suite->type == 'library')
         {
             /* Set lib menu. */
+            if($this->config->global->flow == 'onlyTest') $this->lang->menugroup->testsuite = 'caselib';
             $libraries = $this->testsuite->getLibraries();
             $suiteID   = $this->testsuite->saveLibState($suiteID, $libraries);
             $this->testsuite->setLibMenu($libraries, $suiteID);
@@ -402,6 +403,7 @@ class testsuite extends control
 
         /* Set lib menu. */
         $this->testsuite->setLibMenu($libraries, $libID, $moduleID);
+        if($this->config->global->flow == 'onlyTest') $this->lang->menugroup->testsuite = 'caselib';
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -464,6 +466,7 @@ class testsuite extends control
         $libraries = $this->testsuite->getLibraries();
         $libID     = $this->testsuite->saveLibState(0, $libraries);
         $this->testsuite->setLibMenu($libraries, $libID);
+        if($this->config->global->flow == 'onlyTest') $this->lang->menugroup->testsuite = 'caselib';
 
         $this->view->title      = $this->lang->caselib->common . $this->lang->colon . $this->lang->testsuite->createLib;
         $this->view->position[] = $this->lang->caselib->common;
@@ -503,6 +506,7 @@ class testsuite extends control
         $libraries = $this->testsuite->getLibraries();
         $libID     = $this->testsuite->saveLibState($libID, $libraries);
         $this->testsuite->setLibMenu($libraries, $libID);
+        if($this->config->global->flow == 'onlyTest') $this->lang->menugroup->testsuite = 'caselib';
 
         $type         = 'feature';
         $stage        = '';
@@ -579,6 +583,7 @@ class testsuite extends control
 
         /* Set lib menu. */
         $this->testsuite->setLibMenu($libraries, $libID);
+        if($this->config->global->flow == 'onlyTest') $this->lang->menugroup->testsuite = 'caselib';
 
         $currentModuleID = (int)$moduleID;
 
@@ -610,6 +615,7 @@ class testsuite extends control
         /* Set lib menu. */
         $libraries = $this->testsuite->getLibraries();
         $this->testsuite->setLibMenu($libraries, $libID);
+        if($this->config->global->flow == 'onlyTest') $this->lang->menugroup->testsuite = 'caselib';
 
         $this->loadModel('testcase');
         $this->view->title      = $lib->name . $this->lang->colon . $this->lang->testsuite->view;
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 201a6e45e2..82bc7651ae 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -44,7 +44,7 @@ class testtaskModel extends model
                     $viewName = $scope == 'local'? $products[$productID] : $this->lang->testtask->all;
 
                     $replace  = '<li>';
-                    $replace .= "<a data-toggle='dropdown'>{$viewName} <span class='caret'></span></a>";
+                    $replace .= "<a href='###' data-toggle='dropdown'>{$viewName} <span class='caret'></span></a>";
                     $replace .= "<ul class='dropdown-menu' style='max-height:240px;overflow-y:auto'>";
                     $replace .= "<li>" . html::a(helper::createLink('testtask', 'browse', "productID=$productID&branch=$branch&type=all,$status"), $this->lang->testtask->all) . "</li>";
                     $replace .= "<li>" . html::a(helper::createLink('testtask', 'browse', "productID=$productID&branch=$branch&type=local,$status"), $products[$productID]) . "</li>";