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

FCLT#55843 Workflows kun je afbreken met optie DOORSTUREN - Onwenselijk

Browse Source 
svn path=/Website/trunk/; revision=40451
This commit is contained in:
Erik Groener
2019-01-09 09:51:45 +00:00
parent 97447384e7
commit f344bf202e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
APPL/MLD/mld.inc
View File

@@ -3505,6 +3505,7 @@ mld = {setmeldingstatus:
var frontendprio = moRs("mld_disc_params_frontendprio").Value == 1;
var is_wf_step = !(moRs("mld_workflowstep_key").Value == null);
var is_wf_root = is_wf_step && (moRs("mld_melding_start_key").Value == pmld_melding_key);
var is_wf = is_wf_step || is_wf_root;
var is_kopieerbaar = moRs("mld_stdmelding_kopieerbaar").Value == 1;
var wfstep = moRs("mld_workflowstep_key").Value;
var melder_key = moRs("prs_perslid_key").Value;
@@ -3747,7 +3748,7 @@ mld = {setmeldingstatus:
mresult.canReject = ((mresult.canWrite("WEB_MLDBOF") && !activeMLDBO3) || mresult.canWrite("WEB_MLDBO3")) &&
(!is_wf_step || (is_wf_step && mld.wfIsRejectable(wfstep))) &&
!is_planned_action;
mresult.canForward = (mresult_vakg.canWrite("WEB_MLDBOF") && !is_planned_action);
mresult.canForward = (mresult_vakg.canWrite("WEB_MLDBOF") && !is_planned_action && !is_wf);
mresult.canClose = (mresult.canWrite("WEB_MLDBOF") || (mresult.canWrite("WEB_MLDFOF") && (params && params.verynew))) && !is_wf_root && !is_planned_action;
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.canVakgChange = (mresult_vakg.canWrite("WEB_MLDFOF") || mresult_vakg.canFEwrite || mresult_vakg.canWrite("WEB_MLDBOF"));
@@ -3775,7 +3776,7 @@ mld = {setmeldingstatus:
mresult.canReject = ((mresult.canWrite("WEB_MLDBOF") && !activeMLDBO3) || mresult.canWrite("WEB_MLDBO3")) &&
(!is_wf_step || (is_wf_step && mld.wfIsRejectable(wfstep))) &&
!is_planned_action;
mresult.canForward = (mresult_vakg.canWrite("WEB_MLDBOF") && !is_planned_action); // willekeurige vakgroep
mresult.canForward = (mresult_vakg.canWrite("WEB_MLDBOF") && !is_planned_action && !is_wf); // willekeurige vakgroep
mresult.canClose = (mresult.canWrite("WEB_MLDBOF") && !is_wf_root && !is_planned_action);
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.canVakgChange = (mresult_vakg.canWrite("WEB_MLDBOF")); // vakgroep waar je zelf schrijfrechten op hebt
@@ -3811,7 +3812,7 @@ mld = {setmeldingstatus:
// FO kan alleen omschrijving aanpassen
mresult.canChange = (mresult.canWrite("WEB_MLDBOF") || mresult.canWrite("WEB_MLDFOF"));
mresult.canChangeUrole = mresult.canWrite("WEB_MLDBOF")? 'bo' : 'fo';
mresult.canForward = (!is_wf_root &&
mresult.canForward = (!is_wf &&
(S("mld_forward_if_active") == 1 || (keten && !hasopdrachten)) && // Een melding met opdrachten mag niet meer doorgestuurd worden (MAYF#36363).
mresult_vakg.canWrite("WEB_MLDBOF") &&
!is_planned_action);