Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #16607.

Browse Source
This commit is contained in:
tianshujie
2022-03-29 15:00:12 +08:00
parent 7885b87ef3
commit 84aaab5508
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/control.php
+2 -2
View File
@@ -1406,8 +1406,8 @@ class testtask extends control
$this->app->rawModule = 'testcase';
$projectID = $this->app->tab == 'qa' ? 0 : $this->session->project;
$executions = empty($productID) ? array() : $this->loadModel('product')->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID);
$builds = empty($productID) ? array() : $this->loadModel('build')->getBuildPairs($productID, 0, 'notrunk');
$executions = empty($productID) ? array() : $this->loadModel('product')->getExecutionPairsByProduct($productID, '', 'id_desc', $projectID);
$builds = empty($productID) ? array() : $this->loadModel('build')->getBuildPairs($productID, 'all', 'notrunk');
$this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->importUnitResult;
$this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]);
module/testtask/js/common.js
+5 -3
View File
@@ -95,10 +95,12 @@ function loadExecutionRelated(executionID)
*/
function loadExecutionBuilds(executionID, selected)
{
selectedBuild = $('#build').val();
var selectedBuild = $('#build').val();
productID = config.currentMethod == 'importunitresult' ? productID : $('#product').val();
if(!selectedBuild) selectedBuild = 0;
link = createLink('build', 'ajaxGetExecutionBuilds', 'executionID=' + executionID + '&productID=' + $('#product').val() + '&varName=testTaskBuild&build=' + selectedBuild, '', '', executionID);
if(executionID == 0) link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + $('#product').val() + '&varName=resolvedBuild&build=' + selectedBuild);
link = createLink('build', 'ajaxGetExecutionBuilds', 'executionID=' + executionID + '&productID=' + productID + '&varName=testTaskBuild&build=' + selectedBuild);
if(executionID == 0) link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + '&varName=resolvedBuild&build=' + selectedBuild);
$('#buildBox').load(link, function()
{
$('#resolvedBuild').attr('id', 'build').attr('name', 'build').find('option[value=trunk]').remove();
module/testtask/view/importunitresult.html.php
+1
View File
@@ -17,6 +17,7 @@
.input-group>.chosen-container.required:after {top: 6px;}
</style>
<?php js::import($jsRoot . 'misc/date.js');?>
<?php js::set('productID', $productID);?>
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div class='main-header'>