admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#38350 Setting mld_melding_close doet niet wat in de beschrijving staat

Browse Source 
svn path=/Website/trunk/; revision=31387
This commit is contained in:
Ruud Lipper
2016-11-09 08:37:01 +00:00
parent a0a05f65cb
commit 3dcafb91d9
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
APPL/MLD/mld_list.inc
View File

@@ -427,10 +427,11 @@ function mld_list (pautfunction, params)
{ {
// We weten al dat we mogen lezen. Geef dat mee aan func_enabled_melding, die wordt daar efficienter van // We weten al dat we mogen lezen. Geef dat mee aan func_enabled_melding, die wordt daar efficienter van
var mldkey = oRs("mld_melding_key").Value; var mldkey = oRs("mld_melding_key").Value;
var nractief = oRs("nrActief").Value; // open Opdrachten
var this_mld = mld.func_enabled_melding(mldkey, { dontcarelink: true, knownread: true }); var this_mld = mld.func_enabled_melding(mldkey, { dontcarelink: true, knownread: true });
var eEdit = this_mld.canChange; // Wijzigen var eEdit = this_mld.canChange; // Wijzigen
var eReject = this_mld.canReject; // Afwijzen var eReject = this_mld.canReject; // Afwijzen
var eClose = this_mld.canClose; // Afmelden var eClose = (this_mld.canClose && (S("mld_melding_close") == 0 || nractief == 0)); // Afmelden
var eAccept = this_mld.canAccept; // Accepteren var eAccept = this_mld.canAccept; // Accepteren
var eContinue = this_mld.canContinue; // Vervolg ('kopie') var eContinue = this_mld.canContinue; // Vervolg ('kopie')
var eForward = this_mld.canForward; // Doorsturen var eForward = this_mld.canForward; // Doorsturen
@@ -513,7 +514,7 @@ function mld_list (pautfunction, params)
return oRs("nrOrders").Value == 1 ? "1 " + L("lcl_shared_order") : oRs("nrOrders").Value + " " + L("lcl_orders"); return oRs("nrOrders").Value == 1 ? "1 " + L("lcl_shared_order") : oRs("nrOrders").Value + " " + L("lcl_orders");
else else
return null; return null;
} }
function fncolKey(oRs) function fncolKey(oRs)
{ {
@@ -843,8 +844,8 @@ function mld_list (pautfunction, params)
if (urole=="fo" || urole =="bo") // dan hebben we fnrowActionEnabler aangezet if (urole=="fo" || urole =="bo") // dan hebben we fnrowActionEnabler aangezet
{ {
rst.addAction({ action: "mld_reject", caption: L("lcl_reject"), enabler:"eReject", multi: !tiny, multiOnce: true } ); rst.addAction({ action: "mld_reject", caption: L("lcl_reject"), enabler:"eReject", multi: !tiny, multiOnce: true } );
if (S("mld_melding_close") == 0) // als ik dit via de enabler doe, heb ik em multi nog steeds // Bulk afmelden mag alleen als mld_melding_close = 0.
rst.addAction({ action: "mld_close", caption: L("lcl_close"), enabler:"eClose", multi: !tiny, multiOnce: true } ); rst.addAction({ action: "mld_close", caption: L("lcl_close"), enabler:"eClose", multi: (!tiny && S("mld_melding_close") == 0) , multiOnce: (S("mld_melding_close") == 0)} );
rst.addAction({ action: "mld_accept", caption: L("lcl_mld_accept"), enabler:"eAccept", multi: !tiny, multiOnce: true } ); rst.addAction({ action: "mld_accept", caption: L("lcl_mld_accept"), enabler:"eAccept", multi: !tiny, multiOnce: true } );
rst.addAction({ action: "mld_continue", caption: L("lcl_mld_continuation"), enabler: "eContinue" } ); rst.addAction({ action: "mld_continue", caption: L("lcl_mld_continuation"), enabler: "eContinue" } );
// E<>n van beiden, eEmptyRequiredFields of eForward, is true. // E<>n van beiden, eEmptyRequiredFields of eForward, is true.