diff --git a/module/testtask/control.php b/module/testtask/control.php index 03c4bfbff9..bb6e608e1c 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -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]); diff --git a/module/testtask/js/common.js b/module/testtask/js/common.js index 7a2db64b9d..4359e72b0e 100644 --- a/module/testtask/js/common.js +++ b/module/testtask/js/common.js @@ -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(); diff --git a/module/testtask/view/importunitresult.html.php b/module/testtask/view/importunitresult.html.php index 2212a742e6..5615309f2d 100644 --- a/module/testtask/view/importunitresult.html.php +++ b/module/testtask/view/importunitresult.html.php @@ -17,6 +17,7 @@ .input-group>.chosen-container.required:after {top: 6px;} +