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

AQQA#54479 Als je direct een STDM kiest, komen nu ook op vakgroep gescoped kennisbankitems direct mee (ook al is vakgroep (nog) niet ingevuld

Browse Source 
svn path=/Website/branches/v2018.1/; revision=39011
This commit is contained in:
Koen Reefman
2018-08-31 08:11:15 +00:00
parent 59e754d4f8
commit 35adf192fc
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
APPL/MLD/mld.inc
View File

@@ -2991,6 +2991,15 @@ mld = {setmeldingstatus:
if (!has.ins && !has.stdm && !has.loc)
return {};
if (!has.ins && has.stdm && changed == 1) // Then find ins_disc_key
{
var insSql = "SELECT mld_ins_discipline_key FROM mld_stdmelding WHERE mld_stdmelding_key = " + stdm_key;
var insoRs = Oracle.Execute(insSql);
ins_disc_key = insoRs(0).Value;
insoRs.Close();
has.ins = ins_disc_key && ins_disc_key != -1;
}
var canFAQUSEread = user.checkAutorisation("WEB_FAQUSE", true);
var canFAQFOFread = user.checkAutorisation("WEB_FAQFOF", true);
var faq_bits = 0;

9
APPL/MLD/mld_faq.asp
View File

@@ -87,6 +87,15 @@ user.auth_required_or_abort(authparamsUSE || authparamsFOF);
var filtWHERE = " AND ff.fac_faq_key = sf.fac_faq_key"
+ " AND ";
if (!has.ins && has.stdm && changed == 1) // Then find ins_disc_key
{
var insSql = "SELECT mld_ins_discipline_key FROM mld_stdmelding WHERE mld_stdmelding_key = " + stdm_key;
var insoRs = Oracle.Execute(insSql);
ins_disc_key = insoRs(0).Value;
insoRs.Close();
has.ins = ins_disc_key && ins_disc_key != -1;
}
// Stdmfilter, at least: (has.ins || has.stdm) == true
if (has.ins) // Vakgroep
filtWHERE += " ((sf.ins_discipline_key = " + ins_disc_key