From fb4e757e6a1cd006ecff7b01b9e0421899a58dec Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 8 May 2017 14:51:17 +0800 Subject: [PATCH] * code for task #2987. --- module/testcase/js/importfromlib.js | 23 +++++++++++++-------- module/testcase/view/importfromlib.html.php | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/module/testcase/js/importfromlib.js b/module/testcase/js/importfromlib.js index aff82bdf5a..6f5a944541 100644 --- a/module/testcase/js/importfromlib.js +++ b/module/testcase/js/importfromlib.js @@ -4,18 +4,23 @@ function reload(libID) location.href = link; } -function setModule(moduleID, obj) +function setModule(obj) { - var index = $(obj).closest('tr').index() + 1; - var $tr = $(obj).closest('tbody').find('tr'); + var moduleID = $(obj).val(); + var libModule = $(obj).closest('td').data('module'); - while($tr.eq(index).length > 0) + var index = $(obj).closest('tr').index(); + + console.log(moduleID); + console.log(libModule); + console.log(index); + $(obj).closest('tbody').find('tr').each(function(i) { - $module = $tr.eq(index).find(obj).find("select[name*='module']"); - $module.val(moduleID); - $module.trigger("chosen:updated"); - index ++; - } + if(i > index) + { + $(this).find("[data-module='" + libModule + "']").find("select[id^='module']").val(moduleID).trigger("chosen:updated"); + } + }) } $(function() diff --git a/module/testcase/view/importfromlib.html.php b/module/testcase/view/importfromlib.html.php index 56ec88e48e..5d7387c4f4 100644 --- a/module/testcase/view/importfromlib.html.php +++ b/module/testcase/view/importfromlib.html.php @@ -48,7 +48,7 @@ testcase->priList, $case->pri, $case->pri)?>'>pri == '0' ? '' : zget($lang->testcase->priList, $case->pri, $case->pri);?> id", $case->title)) echo $case->title;?> module, '');?> - id}]", $modules, 0, "class='from-control chosen' onchange='setModule(this.value, \".module-{$case->module}\")'");?> + id}]", $modules, 0, "class='from-control chosen' onchange='setModule(this)'");?> testcase->typeList, $case->type);?>