From 84e91fc75ad26e76ff8eb4967a4fc885af36e6f3 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 16 Aug 2017 14:24:58 +0800
Subject: [PATCH]  * finish task #3102.

---
 module/bug/js/browse.js              | 5 +++++
 module/bug/view/browse.html.php      | 2 ++
 module/product/js/browse.js          | 5 +++++
 module/product/view/browse.html.php  | 2 ++
 module/project/js/task.js            | 6 ++++++
 module/project/view/task.html.php    | 1 +
 module/search/control.php            | 5 ++++-
 module/testcase/js/browse.js         | 5 +++++
 module/testcase/view/browse.html.php | 2 ++
 9 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/module/bug/js/browse.js b/module/bug/js/browse.js
index f8542352d7..75ae5abf17 100644
--- a/module/bug/js/browse.js
+++ b/module/bug/js/browse.js
@@ -57,3 +57,8 @@ $(document).ready(function()
         })
     }
 });
+
+function setQueryBar(queryID, title)
+{
+    $('#bysearchTab').before("<li id='QUERY" + queryID + "Tab' class='active'><a href='" + createLink('bug', 'browse', "productID=" + productID + "&branch=" + branch + "&browseType=bysearch&param=" + queryID) + "'>" + title + "</a></li>");
+}
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index ba768a0c10..db00b0a83f 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -17,6 +17,8 @@ js::set('browseType',    $browseType);
 js::set('moduleID',      $moduleID);
 js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrowseType == 'bysearch') ? 'all' : $this->session->bugBrowseType);
 js::set('flow', $this->config->global->flow);
+js::set('productID', $productID);
+js::set('branch', $branch);
 ?>
 <?php if($this->config->global->flow == 'onlyTest'):?>
 <div id='featurebar'>
diff --git a/module/product/js/browse.js b/module/product/js/browse.js
index aed4662921..4396973d1c 100644
--- a/module/product/js/browse.js
+++ b/module/product/js/browse.js
@@ -24,3 +24,8 @@ $(function()
     setTimeout(function(){fixedTfootAction('#productStoryForm')}, 100);
     setTimeout(function(){fixedTheadOfList('#storyList')}, 100);
 })
+
+function setQueryBar(queryID, title)
+{
+    $('#bysearchTab').before("<li id='QUERY" + queryID + "Tab' class='active'><a href='" + createLink('product', 'browse', "productID=" + productID + "&branch=" + branch + "&browseType=bysearch&param=" + queryID) + "'>" + title + "</a></li>");
+}
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index f632191df8..c50987bb11 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -13,6 +13,8 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datatable.fix.html.php';?>
 <?php js::set('browseType', $browseType);?>
+<?php js::set('productID', $productID);?>
+<?php js::set('branch', $branch);?>
 <div id='featurebar'>
   <ul class='nav'>
     <li>
diff --git a/module/project/js/task.js b/module/project/js/task.js
index fc2fc74f7c..e464c5916e 100644
--- a/module/project/js/task.js
+++ b/module/project/js/task.js
@@ -22,5 +22,11 @@ $(function()
     });
 });
 
+function setQueryBar(queryID, title)
+{
+    var $tagTab = $('#featurebar #calendarTab').size() > 0 ? $('#featurebar #calendarTab') : $('#featurebar #kanbanTab');
+    $tagTab.before("<li id='QUERY" + queryID + "Tab' class='active'><a href='" + createLink('project', 'task', "projectID=" + projectID + "&browseType=bysearch&param=" + queryID) + "'>" + title + "</a></li>");
+}
+
 $('#module' + moduleID).addClass('active');
 $('#product' + productID).addClass('active');
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 46b83bff8a..32fa210107 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -18,6 +18,7 @@ include '../../common/view/datatable.fix.html.php';
 include './taskheader.html.php';
 js::set('moduleID', $moduleID);
 js::set('productID', $productID);
+js::set('projectID', $projectID);
 js::set('browseType', $browseType);
 ?>
 <div class='side' id='taskTree'>
diff --git a/module/search/control.php b/module/search/control.php
index 4172a0dc04..f5f952177a 100644
--- a/module/search/control.php
+++ b/module/search/control.php
@@ -69,7 +69,10 @@ class search extends control
         {
             $queryID = $this->search->saveQuery();
             if(!$queryID) die(js::error(dao::getError()));
-            die(js::closeModal('parent.parent', '', "function(){parent.parent.loadQueries($queryID)}"));
+
+            $onMenuBarFunc = '';
+            if($this->post->onMenuBar) $onMenuBarFunc = "if(typeof parent.parent.setQueryBar === 'function') parent.parent.setQueryBar($queryID, '{$this->post->title}')";
+            die(js::closeModal('parent.parent', '', "function(){parent.parent.loadQueries($queryID);$onMenuBarFunc}"));
         }
         $this->view->module    = $module;
         $this->view->onMenuBar = $onMenuBar;
diff --git a/module/testcase/js/browse.js b/module/testcase/js/browse.js
index 2ef7983880..461a05270a 100644
--- a/module/testcase/js/browse.js
+++ b/module/testcase/js/browse.js
@@ -56,3 +56,8 @@ $(document).ready(function()
         $('#modulemenu > .nav > li[data-id=' + browseType + ']').addClass('active');
     }
 });
+
+function setQueryBar(queryID, title)
+{
+    $('#bysearchTab').before("<li id='QUERY" + queryID + "Tab' class='active'><a href='" + createLink('testcase', 'browse', "productID=" + productID + "&branch=" + branch + "&browseType=bysearch&param=" + queryID) + "'>" + title + "</a></li>");
+}
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index b924363056..003eaa50a9 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -20,6 +20,8 @@ js::set('caseBrowseType', ($browseType == 'bymodule' and $this->session->caseBro
 js::set('moduleID'  ,     $moduleID);
 js::set('confirmDelete',  $lang->testcase->confirmDelete);
 js::set('batchDelete',    $lang->testcase->confirmBatchDelete);
+js::set('productID',      $productID);
+js::set('branch',         $branch);
 ?>
 <div class='side' id='treebox'>
   <a class='side-handle' data-id='testcaseTree'><i class='icon-caret-left'></i></a>