diff --git a/APPL/MLD/mld_cancelworkflow.asp b/APPL/MLD/mld_cancelworkflow.asp index 59a33c0ed1..9a16225ef3 100644 --- a/APPL/MLD/mld_cancelworkflow.asp +++ b/APPL/MLD/mld_cancelworkflow.asp @@ -32,20 +32,25 @@ user.anything_todo_or_abort(mld_info.workflowRoot && user.has(autfunction) && S( // Standaard checks op verplichte velden, datum formaat, numeriek en float formaat, currency formaat. if (!validateForm("cancelworkflowform")) - return false; + return false; $.post( $("form[name=cancelworkflowform]")[0].action , $("[name=cancelworkflowform]").serialize() - , function(json) { - if (json.success) - FcltMgr.closeDetail(window, { cancel: true } ); - else - iface.button.enable("btn_cont_submit"); - } + , mld_cont_callback , "json"); + return true; // disable button } + function mld_cont_callback(json, textStatus) + { + if (json.success) + FcltMgr.closeDetail(window, { cancel: true } ); + else + iface.button.enable("btn_cont_submit"); + FcltCallbackClose(json); + } + function mld_cancel() { FcltMgr.closeDetail(window, { cancel: true } ); diff --git a/APPL/MLD/mld_cancelworkflow_save.asp b/APPL/MLD/mld_cancelworkflow_save.asp index 1584529b2e..0a3924255f 100644 --- a/APPL/MLD/mld_cancelworkflow_save.asp +++ b/APPL/MLD/mld_cancelworkflow_save.asp @@ -62,7 +62,7 @@ function cancel_workflowstep(mld_key) Oracle.Execute(sql_i); // tracking: Vervolgmelding {0} is afgesloten. - var melding_nr = mld_mld.mld_prefix(mld_key) || mld_key; + var melding_nr = mld.mld_prefix(mld_key) || mld_key; shared.trackaction("#MLDAFM", mld_key, L("lcl_mld_cancel_workflow_tracking").format(melding_nr)); } @@ -77,8 +77,10 @@ function cancel_workflowstep(mld_key) workflow_tree(mld_root_key); - result.toaster = L("lcl_mld_cancel_workflow_success"); - var result = { key: mld_root_key, success: true }; + var result = { key: mld_root_key + , toaster: L("lcl_mld_cancel_workflow_success") + , success: true + }; Response.Write(JSON.stringify(result)); Response.End; %>