Foutieve Merge laatste 2017.3 wijzigingen

svn path=/Website/branches/v2018.1/; revision=39869
This commit is contained in:
Jos Groot Lipman
2018-11-19 17:11:16 +00:00
parent 6d144da589
commit ba872ec5e0
2 changed files with 3 additions and 3 deletions

View File

@@ -82,7 +82,7 @@ authparams = last_this_ins.authparams(autfunction);
}
else
insUpd = { trackarray: [] };
debugger;
/* flextrackarray = */ ins.updateKenmerkdeel(ingesloten[i], {multimode: true});
var update_string = L("lcl_ins_is_insupd") + "\n" + insUpd.trackarray.join("\n");

View File

@@ -3587,7 +3587,7 @@ mld = {setmeldingstatus:
case 4: // Geaccepteerd ('In behandeling') (expliciet mld_accept_save.asp of als backoffice bewerkt en opslaat)
mresult.canStdmChange = (mresult.canWrite("WEB_MLDBOF") || mresult.canWrite("WEB_MLDBO3")) && !is_wf_root
mresult.canKostChange = (mresult.canWrite("WEB_MLDBOF") || mresult.canWrite("WEB_MLDBO3") || mresult.canFEwrite);
mresult.canFlexChange = 1; //||(mresult.canWrite("WEB_MLDBOF") || mresult.canWrite("WEB_MLDBO3"));
mresult.canFlexChange = (mresult.canWrite("WEB_MLDBOF") || mresult.canWrite("WEB_MLDBO3"));
mresult.canPlaatsChange = (mresult.canWrite("WEB_MLDBOF") || mresult.canWrite("WEB_MLDBO3"));
mresult.canAflChange = (mresult.canWrite("WEB_MLDBOF") || mresult.canWrite("WEB_MLDBO3"));
// Alleen BO/FO kan melding aanpassen. FE toevoegen voor canPrioChange heeft geen zin.
@@ -3608,7 +3608,7 @@ mld = {setmeldingstatus:
mresult.canClose = (mresult.canWrite("WEB_MLDBOF") || mresult.canWrite("WEB_MLDBO2")) &&
!is_wf_root && (!is_planned_action || (is_planned_action && opdr_action_aantal == 0)); // Als de laatste geplande actie is geweest mag de melding afgemeld worden.
mresult.canContinue = (mresult.canWrite("WEB_MLDFOF") || mresult.canWrite("WEB_MLDBOF")) && mresult_no_disc.canWrite("WEB_MLDFOF") && !is_planned_action && !S("mld_disable_continuation"); //mldfof_write;
mresult.canFlexChange = 1;//(mresult.canWrite("WEB_MLDBOF"));
mresult.canFlexChange = (mresult.canWrite("WEB_MLDBOF"));
// FOF kan alleen omschrijving aanpassen
mresult.canOmsChange = mresult.canWrite("WEB_MLDFOF");
mresult.canAfhandChange = mresult.canWrite("WEB_MLDBOF");