From 72c9bcb868c5c54d014c7df72c438c700ad97bfd Mon Sep 17 00:00:00 2001 From: Koen Reefman Date: Mon, 3 Nov 2025 09:04:21 +0000 Subject: [PATCH] SGGR#90933 en ook voor afwijzen svn path=/Website/branches/v2025.3/; revision=70777 --- APPL/MLD/get_mld_info_ajax.asp | 13 +++++++++++++ APPL/MLD/mld.js | 9 +++++++-- APPL/MLD/mld_show_melding.js | 13 ++++++++----- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/APPL/MLD/get_mld_info_ajax.asp b/APPL/MLD/get_mld_info_ajax.asp index 54bbab84d1..ffdd879da7 100644 --- a/APPL/MLD/get_mld_info_ajax.asp +++ b/APPL/MLD/get_mld_info_ajax.asp @@ -288,6 +288,19 @@ switch (req_info) break; } + case "show_after_reject": + { + protectQS.verify({ allowparams: ["req_info"]}); + var mld_key = getQParamInt("mld_key", -1); + var mfe = mld.func_enabled_melding(mld_key); + + result.show = mfe.canReadAny || mfe.canChangeKenmerkBlok; + if (!mfe.canReadAny) { + result.toaster = L("lcl_mld_is_mldrej"); + } + + break; + } case "show_after_fwd": { protectQS.verify({ allowparams: ["req_info"]}); diff --git a/APPL/MLD/mld.js b/APPL/MLD/mld.js index c13ce05d6a..335df77516 100644 --- a/APPL/MLD/mld.js +++ b/APPL/MLD/mld.js @@ -65,8 +65,13 @@ function doublecheckCallback(json, modalParams) } else { - if (reloadmld) - parent.location.href = "mld_melding.asp?urole=" + urole + "&mld_key=" + mld_key_arr + "&embedded=1"; + if (reloadmld) { + if (json.reject) { + mld_melding_rejected(); + } else { + parent.location.href = "mld_melding.asp?urole=" + urole + "&mld_key=" + mld_key_arr + "&embedded=1"; + } + } else FcltCallbackRefresh({success: true}); } diff --git a/APPL/MLD/mld_show_melding.js b/APPL/MLD/mld_show_melding.js index 9bbea4fe28..fb4850eb2b 100644 --- a/APPL/MLD/mld_show_melding.js +++ b/APPL/MLD/mld_show_melding.js @@ -60,6 +60,13 @@ function mld_melding_ingestemd() { mld_reload_or_close); } +function mld_melding_rejected() { + var data = { req_info: "show_after_reject"}; + $.getJSON(protected_mld_info_ajax, + data, + mld_reload_or_close); +} + function mld_reload_or_close(json, textStatus) { if (json) @@ -142,11 +149,7 @@ function mld_reject() url = "../mld/mld_reject.asp?urole=" + urole + "&mld_key=" + mld_key FcltMgr.openModalDetail(url, L("lcl_mld_complain") + ' ' + mldPrefix + mld_key, - {callback: function() - { - FcltMgr.closeDetail(window, {close: true}); - mld_melding_reload(mld_key); - }} + { callback: FcltCallbackAndThen(mld_melding_rejected) } ); } }