diff --git a/APPL/MLD/mld.inc b/APPL/MLD/mld.inc index b95bcde424..17cf43211b 100644 --- a/APPL/MLD/mld.inc +++ b/APPL/MLD/mld.inc @@ -4928,7 +4928,7 @@ mld = {setmeldingstatus: : safe.quoted_sql(autfunction) ); var mySRTsql = // All ins_srtdiscipline with any ins_discipline beneath it we have write-rights for - "SELECT sd.ins_srtdiscipline_key" + "SELECT DISTINCT sd.ins_srtdiscipline_key" + ", " + lcl.xsqla('sd.ins_srtdiscipline_omschrijving', 'ins_srtdiscipline_key') + " FROM ins_v_aanwezigsrtdiscipline sd" + " , mld_discipline td" @@ -4937,7 +4937,6 @@ mld = {setmeldingstatus: + " WHERE td.ins_srtdiscipline_key = sd.ins_srtdiscipline_key" + " AND msm.mld_ins_discipline_key = td.ins_discipline_key" + (params.filter_where ? params.filter_where : "") - + " AND sd.ins_srtdiscipline_ins = 1" + " AND sd.ins_srtdiscipline_module = 'MLD'" + " AND sd.ins_srtdiscipline_key <> " + S("kto_srtdiscipline_key") + " AND msm.mld_stdmelding_verwijder IS NULL" @@ -4954,7 +4953,7 @@ mld = {setmeldingstatus: + " OR ff.fac_functie_code = 'WEB_MLDFOF')" + " AND fw.fac_gebruiker_alg_level_write < 9" + " AND fw.fac_gebruiker_prs_level_write < 9" - + " AND fw.prs_perslid_key = 3)" + + " AND fw.prs_perslid_key = " + user_key + ")" + (params.ins_key > 0 // dan moet die discipline ook nog meldingen hebben die betrekking *kunnen* // hebben op ons object. In theorie zouden we ook nog kunnen ALG-scopen... ? " AND EXISTS (SELECT msm.mld_ins_discipline_key" @@ -4968,6 +4967,7 @@ mld = {setmeldingstatus: + " AND ((d.ins_alg_ruimte_type = 'A'" + " AND msm.alg_org_obj_niveau < 9)" + " OR d.ins_alg_ruimte_type != 'A'))" + + " AND sd.ins_srtdiscipline_ins = 1" : "") + " ORDER BY 2";