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

FCLT#55657 Close van open oRs

Browse Source 
svn path=/Website/trunk/; revision=41461
This commit is contained in:
Koen Reefman
2019-03-11 14:56:39 +00:00
parent 6d3fbe7e1b
commit e45fa7d16f
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
APPL/API2/model_custom_fields.inc
View File

@@ -189,7 +189,7 @@ function model_custom_fields(formodel, flexModel, flexParams)
var typedata = flexModel.getPropertyType(kenmerkdata); // getPropertyType moet gedefinieerd zijn
var typ = typedata.attributetype.id;
}
if (typ == 'F' || typ == 'M')
if (typ == "F" || typ == "M")
{
if (!(parent_key > 0))
var tmpfolder = safe.filename(shared.random(32));
@@ -222,27 +222,28 @@ function model_custom_fields(formodel, flexModel, flexParams)
}
if (typ != "M" && parent_key > 0)
{
if ((typ == 'S' || typ == 'R') && jsondata.value != "")
if ((typ == "S" || typ == "R") && jsondata.value != "")
{ // convert reference and select text-value to key value
var ksql = "SELECT k.mld_kenmerk_key, sk.mld_srtkenmerk_kenmerktype, sk.mld_srtkenmerk_lengte, sk.fac_kenmerkdomein_key "
+ " FROM mld_kenmerk k"
+ " , mld_srtkenmerk sk"
+ " , mld_stdmelding s"
+ " , mld_discipline d"
+ " WHERE s.mld_ins_discipline_key = d.ins_discipline_key"
+ " AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key "
+ " AND k.mld_kenmerk_verwijder IS NULL "
+ " AND sk.mld_srtkenmerk_upper = UPPER(" + safe.quoted_sql(kenmerkdata.issuepropertytype.name) + ")"
+ " AND s.mld_ins_discipline_key = d.ins_discipline_key"
+ " AND s.mld_stdmelding_key = " + (parseInt(kenmerkdata.mld_issuetype.id, 10) || -1)
+ " AND ((k.mld_stdmelding_key = s.mld_stdmelding_key AND k.mld_kenmerk_niveau = 'S')"
+ " OR (k.mld_stdmelding_key = s.mld_ins_discipline_key AND k.mld_kenmerk_niveau = 'D')"
+ " OR (k.mld_stdmelding_key = d.ins_srtdiscipline_key AND k.mld_kenmerk_niveau = 'T'))";
+ " FROM mld_kenmerk k"
+ " , mld_srtkenmerk sk"
+ " , mld_stdmelding s"
+ " , mld_discipline d"
+ " WHERE s.mld_ins_discipline_key = d.ins_discipline_key"
+ " AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key "
+ " AND k.mld_kenmerk_verwijder IS NULL "
+ " AND sk.mld_srtkenmerk_upper = UPPER(" + safe.quoted_sql(kenmerkdata.issuepropertytype.name) + ")"
+ " AND s.mld_ins_discipline_key = d.ins_discipline_key"
+ " AND s.mld_stdmelding_key = " + (parseInt(kenmerkdata.mld_issuetype.id, 10) || -1)
+ " AND ((k.mld_stdmelding_key = s.mld_stdmelding_key AND k.mld_kenmerk_niveau = 'S')"
+ " OR (k.mld_stdmelding_key = s.mld_ins_discipline_key AND k.mld_kenmerk_niveau = 'D')"
+ " OR (k.mld_stdmelding_key = d.ins_srtdiscipline_key AND k.mld_kenmerk_niveau = 'T'))";
var koRs = Oracle.Execute(ksql);
if (!koRs.eof)
{
jsondata.value = getKenmerkKeyByRef(koRs("fac_kenmerkdomein_key").Value, 'value', jsondata.value) || jsondata.value;
jsondata.value = getKenmerkKeyByRef(koRs("fac_kenmerkdomein_key").Value, "value", jsondata.value) || jsondata.value;
}
koRs.Close();
}
var sql = "BEGIN flx.setflex({0}".format(this.module == "MLD" && flexParams.pNiveau == "O" ? "'OPD'" : safe.quoted_sql(this.module))