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

FCLT#56050 niet automatisch 1 behandelteam invullen (is immers niet verplicht) en rechten-bugfix bij mld_forward

Browse Source 
svn path=/Website/trunk/; revision=41223
This commit is contained in:
Koen Reefman
2019-02-28 11:02:58 +00:00
parent c9d6974397
commit f89652adf5
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
APPL/MLD/mld.inc
View File

@@ -412,6 +412,11 @@ mld = {setmeldingstatus:
this_mld = this_mld || mld.func_enabled_melding(mld_key);
mld_melding = mld_melding || mld.mld_melding_info(mld_key);
// Let op; dit is geen rechten check
// Hier wordt slechts status-afhankelijk bekeken welke types doorsturen er evt. mogelijk zijn;
// fwdType & 1 -> Vakgroep wijzigen (= Corrigeren)
// fwdType & 2 -> Behandelteam wijzigen (= Doorsturen)
var fwdInfo = { "fwdType": 0 };
switch (mld_melding.mld_status)

1
APPL/MLD/mld_accept_confirm.asp
View File

@@ -211,6 +211,7 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
disc_key: (ingesloten.length == 1 ? mld_ins_discipline_key : -1),
module: "MLDB",
perslidKey: user_key,
noJustOne: true,
autfunctionKey: -1, // alles is toegestaan! authparams.autfunctionkey,
srtdisc_key: (S("mld_processing_group_all") ? -1 : (ingesloten.length == 1 ? ins_srtdiscipline_key : last_srtdisc_key)),
onChange: "onChangeBehandelteam"

1
APPL/MLD/mld_edit_melding.asp
View File

@@ -1192,6 +1192,7 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
srtdisc_key: S("mld_processing_group_all") ? null : mld_melding.srtdisc,
onChange: "onChangeBehandelteam",
hidden: hideSelectors,
noJustOne: true,
required: false,
moreinfo: !(mld_key > 0 && !this_mld.canAfhandChange) &&
(user.checkAutorisation("WEB_FAQUSE", true) || user.checkAutorisation("WEB_FAQFOF", true)) && // !readonly && rechten

4
APPL/MLD/mld_forward.asp
View File

@@ -33,7 +33,6 @@ FCLTHeader.Requires({ plugins: ["jQuery", "kenmerk"],
var mld_key = getQParamInt("mld_key");
var opmerk = getFParam("opmerk", "");
var this_mld = mld.func_enabled_melding(mld_key);
user.auth_required_or_abort(this_mld.canForward || this_mld.canFixMelding);
// AUTORISATIEPARAMETERS
var urole = getQParamSafe("urole");
@@ -66,6 +65,8 @@ FCLTHeader.Requires({ plugins: ["jQuery", "kenmerk"],
if (!(fwdType & fwdInfo.fwdType) || (fwdType != 1 && fwdType != 2))
INTERNAL_ERROR_INVALID_FWDTYPE
user.auth_required_or_abort(fwdType == 1 ? (this_mld.canForward || this_mld.canFixMelding) : this_mld.canForwardTeam);
%>
<script>
@@ -260,6 +261,7 @@ FCLTHeader.Requires({ plugins: ["jQuery", "kenmerk"],
disc_key: (S("mld_forward_auto_fill") ? mld_melding.mld_ins_discipline_key : -1),
module: "MLDB",
perslidKey: user_key,
noJustOne: true,
autfunctionKey: -1, // alles is toegestaan! authparams.autfunctionkey,
srtdisc_key: (S("mld_processing_group_all") == 1 ? -1 : mld_melding.srtdisc),
onChange: "onChangeBehandelteam"