From c16c150a40f31c60d1ee893545f3482d2c4e429c Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 22 Aug 2019 13:10:51 +0800 Subject: [PATCH] * finish task #6255. --- module/testtask/js/create.js | 33 +++++----------------------- module/testtask/model.php | 1 - module/testtask/view/create.html.php | 2 +- 3 files changed, 6 insertions(+), 30 deletions(-) diff --git a/module/testtask/js/create.js b/module/testtask/js/create.js index 68dc6a806e..6187212348 100755 --- a/module/testtask/js/create.js +++ b/module/testtask/js/create.js @@ -1,30 +1,12 @@ /** - * load builds of selected product project. - * - * @param productID $productID + * Load project related builds + * * @access public * @return void */ -function loadProductRelated(productID) +function loadProductRelated() { - projectID = $('#project').val(); - loadProductProjectBuilds(productID, projectID); -} - -/** - * loadProductProjectBuilds - * - * @param productID $productID - * @param projectID $projectID - * @access public - * @return void - */ -function loadProductProjectBuilds(productID, projectID) -{ - selectedBuild = $('#build').val(); - if(!selectedBuild) selectedBuild = 0; - link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=testTaskBuild&build=' + selectedBuild); - $('#buildBox').load(link, function(){$('#build').chosen();}); + loadProjectBuilds(parseInt($('#project').val())); } /** @@ -91,10 +73,5 @@ function suitEndDate() $(function() { adjustPriBoxWidth(); - if($('#project').val()) - { - productID = $('#product').val(); - projectID = $('#project').val(); - loadProductProjectBuilds(productID, projectID); - } + if($('#project').val()) loadProjectBuilds($('#project').val()); }); diff --git a/module/testtask/model.php b/module/testtask/model.php index a937a5cc83..02eb5c58cd 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1391,5 +1391,4 @@ class testtaskModel extends model } return array($toList, $ccList); } - } diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php index 5fa2bc65ac..41e0dcd4e6 100644 --- a/module/testtask/view/create.html.php +++ b/module/testtask/view/create.html.php @@ -24,7 +24,7 @@ testtask->product;?> - +