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

PLAT#41693: Autorisatie: Melding bij object niet consequent op desktop e.

Browse Source 
FCLT#54169; Behandelgroepen ondersteunen.

svn path=/Website/trunk/; revision=39433
This commit is contained in:
Maykel Geerdink
2018-10-17 13:02:08 +00:00
parent fe1b7423d5
commit 721c95ca78
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
APPL/MLD/mld.inc
View File

@@ -131,11 +131,11 @@ mld = {setmeldingstatus:
+ "WHERE prs_perslid_key = " + behandelaar2_key;
var loRs = Oracle.Execute(sql);
if ( !loRs.eof )
var behandelaar2_str = L("lcl_mld_is_mldbh2_to") + loRs(0).Value;
var behandelaar2_str = L("lcl_mld_is_mldabh_to") + loRs(0).Value;
else
var behandelaar2_str = L("lcl_mld_is_mldbh2_none");
var behandelaar2_str = L("lcl_mld_is_mldabh_none");
loRs.close();
shared.trackaction((nonoti?"#":"") + "MLDBEW", mld_key, behandelaar2_str);
shared.trackaction((nonoti?"#":"") + "MLDABH", mld_key, behandelaar2_str);
},
trackmeldingupdate:
@@ -2238,7 +2238,7 @@ mld = {setmeldingstatus:
// Create discipline Array for Authorisation, combining Vakgroep & Behandelgroep
result.aut_disc_arr = [];
result.aut_disc_arr.push(result.disc);
if (S("mld_ins_discipline") && result.mld_ins_discipline_key > 0)
if (S("mld_processing_group") && result.mld_ins_discipline_key > 0)
result.aut_disc_arr.push(result.mld_ins_discipline_key);
if (result.locked_user_key)
@@ -3509,7 +3509,7 @@ mld = {setmeldingstatus:
var disc_arr = [];
disc_arr.push(stdm_ins_discipline_key);
if (S("mld_ins_discipline") && mld_ins_discipline_key > 0)
if (S("mld_processing_group") && mld_ins_discipline_key > 0)
disc_arr.push(mld_ins_discipline_key);
var mresult = user.func_enabled2("MLD",
@@ -3524,7 +3524,7 @@ mld = {setmeldingstatus:
mresult.canFEread = mresult.canRead("WEB_MLDUSE") && user.isCollega(moRs("prs_perslid_key").Value);
mresult.canFEwrite = mresult.canWrite("WEB_MLDUSE") && user.isCollega(moRs("prs_perslid_key").Value);
if (S("mld_ins_discipline") && mld_ins_discipline_key > 0)
if (S("mld_processing_group") && mld_ins_discipline_key > 0)
{
var mresult_vakg = user.func_enabled2("MLD",
{ ins_discipline_key: stdm_ins_discipline_key,
@@ -4963,14 +4963,13 @@ mld = {setmeldingstatus:
? " AND EXISTS (SELECT msm.mld_ins_discipline_key"
+ " FROM mld_v_mld_stdmelding_srtinst mss"
+ " , ins_deel d"
+ " WHERE msm.mld_stdmelding_key = mss.mld_stdmelding_key" //(+)
+ " AND msm.mld_ins_discipline_key = td.ins_discipline_key"
+ " WHERE msm.mld_stdmelding_key = mss.mld_stdmelding_key"
+ " AND mss.ins_deel_key = d.ins_deel_key"
+ " AND mss.ins_deel_key IN (" + params.ins_key.join(",") + ")"
+ " AND msm.mld_stdmelding_verwijder IS NULL"
+ " AND ((d.ins_alg_ruimte_type = 'A'"
+ " AND msm.alg_org_obj_niveau < 9)"
+ " AND ((d.ins_alg_ruimte_type = 'A' AND msm.alg_org_obj_niveau < 9)"
+ " OR d.ins_alg_ruimte_type != 'A'))"
+ " AND msm.mld_ins_discipline_key = td.ins_discipline_key"
+ " AND msm.mld_stdmelding_verwijder IS NULL"
+ " AND sd.ins_srtdiscipline_ins = 1"
: "")
+ " ORDER BY 2";