From bb47bfa04ce6b0d5cf7c2f1a2809e45312aa434e Mon Sep 17 00:00:00 2001 From: zhouxin Date: Thu, 31 Mar 2022 06:02:31 +0000 Subject: [PATCH 1/2] * Fix bug #21333. --- module/task/js/create.js | 2 +- module/task/js/edit.js | 2 +- module/task/view/edit.html.php | 2 +- module/tree/control.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/task/js/create.js b/module/task/js/create.js index 0d6fc16c98..d16292575c 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -498,7 +498,7 @@ $(document).ready(function() var extra = $(this).prop('checked') ? 'allModule' : ''; $('#moduleIdBox').load(createLink('tree', 'ajaxGetOptionMenu', "rootID=" + executionID + '&viewType=task&branch=0&rootModuleID=0&returnType=html&fieldID=&needManage=0&extra=' + extra), function() { - $('#moduleIdBox #module').val(moduleID).attr('onchange', "setStories(this.value, " + executionID + ")").chosen(); + $('#moduleIdBox #module').val(moduleID).chosen(); }); }); }); diff --git a/module/task/js/edit.js b/module/task/js/edit.js index 6b3dc79c9c..eacf4ddfb9 100644 --- a/module/task/js/edit.js +++ b/module/task/js/edit.js @@ -152,7 +152,7 @@ $(document).ready(function() var extra = $(this).prop('checked') ? 'allModule' : ''; $('#moduleIdBox').load(createLink('tree', 'ajaxGetOptionMenu', "rootID=" + executionID + '&viewType=task&branch=0&rootModuleID=0&returnType=html&fieldID=&needManage=0&extra=' + extra), function() { - $('#moduleIdBox #module').val(moduleID).attr('onchange', "loadModuleRelated()").chosen(); + $('#moduleIdBox #module').val(moduleID).chosen(); }); }); }); diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index 7477738136..86c852d0c3 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -101,7 +101,7 @@ task->module;?>
- module, 'class="form-control chosen" onchange="loadModuleRelated()"');?> + module, 'class="form-control chosen"');?>
> diff --git a/module/tree/control.php b/module/tree/control.php index 330004dece..b9b2b25bb9 100644 --- a/module/tree/control.php +++ b/module/tree/control.php @@ -467,7 +467,7 @@ class tree extends control else { $changeFunc = ''; - if($viewType == 'task' or $viewType == 'bug' or $viewType == 'case') $changeFunc = "onchange='loadModuleRelated()'"; + if($viewType == 'bug' or $viewType == 'case') $changeFunc = "onchange='loadModuleRelated()'"; $field = $fieldID ? "modules[$fieldID]" : 'module'; $currentModule = $this->tree->getById($currentModuleID); From 3c1789a534c3be17141963a3c8c382dcf09e286c Mon Sep 17 00:00:00 2001 From: zhouxin Date: Thu, 31 Mar 2022 06:29:45 +0000 Subject: [PATCH 2/2] * Fix bug #21333. --- module/task/js/create.js | 13 ------------- module/task/js/edit.js | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/module/task/js/create.js b/module/task/js/create.js index d16292575c..143cb904c8 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -235,19 +235,6 @@ function loadStories(executionID) setStories(moduleID, executionID); } -/** - * load stories of module. - * - * @access public - * @return void - */ -function loadModuleRelated() -{ - moduleID = $('#module').val(); - executionID = $('#execution').val(); - setStories(moduleID, executionID); -} - /** * Set lane. * diff --git a/module/task/js/edit.js b/module/task/js/edit.js index eacf4ddfb9..92971548ad 100644 --- a/module/task/js/edit.js +++ b/module/task/js/edit.js @@ -70,19 +70,6 @@ function loadExecutionMembers(executionID) $('#assignedToIdBox').load(link, function(){$('#assignedToIdBox').find('select').chosen()}); } -/** - * Load module related - * - * @access public - * @return void - */ -function loadModuleRelated() -{ - moduleID = $('#module').val(); - executionID = $('#execution').val(); - loadExecutionStories(executionID, moduleID) -} - /* empty function. */ function setPreview(){}