From c92dfbf5e1a8e08c3ebd97bf24299aa4c42c2379 Mon Sep 17 00:00:00 2001 From: Koen Reefman Date: Mon, 13 Aug 2018 14:27:00 +0000 Subject: [PATCH] UWVA#53105 bugfix: newMelding -> canViewConfidential = true svn path=/Website/branches/v2018.1/; revision=38793 --- APPL/MLD/mld_edit_melding.asp | 12 ++++++++---- APPL/MLD/mld_flexkenmerk.inc | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/APPL/MLD/mld_edit_melding.asp b/APPL/MLD/mld_edit_melding.asp index 1a46cfdc5b..bd69f01745 100644 --- a/APPL/MLD/mld_edit_melding.asp +++ b/APPL/MLD/mld_edit_melding.asp @@ -616,15 +616,19 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY"); function gen_flex(kolommen) // ik weet nog niet waar { %>
<% // Wrapper div voor dynamisch herladen - generateFlexKenmerkBlock ({stdm_arr: mld_melding.stdm > 0?[mld_melding.stdm]:[], + + var flexParams = {stdm_arr: mld_melding.stdm > 0?[mld_melding.stdm]:[], mld_key: mld_copy_key > 0? mld_copy_key : mld_key, copy: mld_copy_key > 0? 1 : null, prs_key: perslidkey, act_key: mld_melding.act_key, reado: (mld_key > 0 && !this_mld.canFlexChange), - flexcolumns: kolommen, - showConfidential: this_mld.canViewConfidential - }); + flexcolumns: kolommen + }; + if (this_mld.canViewConfidential) + flexParams.showConfidential = this_mld.canViewConfidential; + + generateFlexKenmerkBlock (flexParams); %>
<% } diff --git a/APPL/MLD/mld_flexkenmerk.inc b/APPL/MLD/mld_flexkenmerk.inc index 6becf9bdad..68ec3deafc 100644 --- a/APPL/MLD/mld_flexkenmerk.inc +++ b/APPL/MLD/mld_flexkenmerk.inc @@ -440,7 +440,7 @@ function generateFlexKenmerkBlock(params) hideVervallen: newMelding||newOpdracht, niveau: kenmerk_module, wfbuilder: params.wfbuilder, - showConfidential: ("showConfidential" in params && typeof params.showConfidential !== "undefined" ? params.showConfidential : (newMelding || canViewConfidential)) + showConfidential: ("showConfidential" in params ? params.showConfidential : (newMelding || canViewConfidential)) } ); } %>