* finish task #3102.

This commit is contained in:
wangyidong
2017-08-16 14:24:58 +08:00
parent ef4cbfd1e3
commit 84e91fc75a
9 changed files with 32 additions and 1 deletions
+5
View File
@@ -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>");
}
+2
View File
@@ -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'>
+5
View File
@@ -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>");
}
+2
View File
@@ -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>
+6
View File
@@ -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');
+1
View File
@@ -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'>
+4 -1
View File
@@ -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;
+5
View File
@@ -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>");
}
+2
View File
@@ -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>