From 6f101a762269dc22e76eebaebb35db0a2f168077 Mon Sep 17 00:00:00 2001 From: daitingting Date: Wed, 15 Nov 2023 08:36:12 +0000 Subject: [PATCH] * Fix bug for batch unlink stakeholder. --- module/program/js/stakeholder.ui.js | 29 +++++++++++--------------- module/program/ui/stakeholder.html.php | 3 +-- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/module/program/js/stakeholder.ui.js b/module/program/js/stakeholder.ui.js index 8d6d39e340..b22310bcdf 100644 --- a/module/program/js/stakeholder.ui.js +++ b/module/program/js/stakeholder.ui.js @@ -1,20 +1,15 @@ -window.onClickBatchUnlink = function(event) +$(document).off('click', '.batch-unlink').on('click', '.batch-unlink', function() { - zui.Modal - .confirm({message: confirmBatchUnlinkTip, icon:'icon-info-sign', iconClass: 'warning-pale rounded-full icon-2x'}) - .then((confirmed) => - { - if(confirmed) - { - const dtable = zui.DTable.query($(this).target); - const checkedList = dtable.$.getChecks(); - if(!checkedList.length) return; + const dtable = zui.DTable.query($(this).target); + const checkedList = dtable.$.getChecks(); + if(!checkedList.length) return; - const url = $(this).closest('button').data('url'); - const form = new FormData(); - checkedList.forEach((id) => form.append('stakeholderIdList[]', id)); + const url = $(this).data('url'); + const form = new FormData(); + checkedList.forEach((id) => form.append('stakeholderIdList[]', id)); - $.ajaxSubmit({url, data: form}); - } - }); -} + zui.Modal.confirm({message: confirmBatchUnlinkTip, icon:'icon-info-sign', iconClass: 'warning-pale rounded-full icon-2x'}).then((confirmed) => + { + if(confirmed) $.ajaxSubmit({url, data: form}); + }) +}); diff --git a/module/program/ui/stakeholder.html.php b/module/program/ui/stakeholder.html.php index 1e75f2ec46..299d31282d 100644 --- a/module/program/ui/stakeholder.html.php +++ b/module/program/ui/stakeholder.html.php @@ -95,8 +95,7 @@ dtable 'items' => array(array ( 'text' => $lang->unlink, - 'class' => 'btn secondary toolbar-item batch-btn size-sm ajax-submit', - 'onClick' => jsRaw('onClickBatchUnlink'), + 'class' => 'btn primary batch-unlink', 'data-url' => createLink('program', 'batchUnlinkStakeholders', "programID={$programID}") )) ))