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

FSN#40816: Maximum aantal uitdrukkingen in een lijst is 1000.

Browse Source 
svn path=/Website/branches/v2017.1/; revision=34223
This commit is contained in:
Maykel Geerdink
2017-06-12 13:34:18 +00:00
parent ef2eacf599
commit 9abce7250e
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/API2/model_prs_kostensoort.inc
View File

@@ -27,7 +27,7 @@ function model_prs_kostensoort()
+ "SELECT fac_audit_tabelkey" // Verwijderde kosten combinaties.
+ " FROM fac_audit"
+ " WHERE fac_audit_tabelnaam = 'prs_kostencombinatie'"
+ " AND fac_audit_waarde_oud IN ('{0}')"
+ " AND fac_audit_waarde_oud IN ('{1}')"
}
};
this.primary = "prs_kostensoort_key";

2
APPL/API2/model_prs_perslid.inc
View File

@@ -48,7 +48,7 @@ function model_prs_perslid(params)
"childaudit": {"sql": "SELECT fac_audit_tabelkey"
+ " FROM fac_audit"
+ " WHERE fac_audit_tabelnaam = 'fac_gebruikersgroep'"
+ " AND fac_audit_waarde_oud IN ('{0}')"
+ " AND fac_audit_waarde_oud IN ('{1}')"
}
};
this.softdelete = true;

14
APPL/MGT/fac_audit.asp
View File

@@ -40,7 +40,7 @@ function gettablesql(ptable, pchildtable, pchildsql, precord, pmtable)
{
var pfac_audit_tabelkey = " COALESCE((SELECT x.{0}_key".format(pmtable? pmtable : ptable)
+ " FROM " + pchildtable + " x"
+ " WHERE x.{0}_key = a.fac_audit_tabelkey)".format(pchildtable) + ", " + precord + ") fac_audit_tabelkey"; // Als waarde null is dan is het record verwijderd. Dan gewoon key invullen (o.a. voor prs_kostensoort).
+ " WHERE x.{0}_key = a.fac_audit_tabelkey)".format(pchildtable) + ", " + precord[0] + ") fac_audit_tabelkey"; // Als waarde null is dan is het record verwijderd. Dan gewoon key (eerste) invullen (o.a. voor prs_kostensoort).
}
@@ -127,7 +127,7 @@ else
key_field = "{0}_ins_discipline_key".format(module);
var childsql = "SELECT {0}_disc_params_key disc_params_key".format(module)
+ " FROM {0}_disc_params".format(module)
+ " WHERE {0} IN ({1})".format(key_field, record);
+ " WHERE {0} IN ({1})".format(key_field, record.join(","));
if (module != "mrk")
{
@@ -143,25 +143,25 @@ else
{
case "fac_groep": childsql = "SELECT fac_groeprechten_key"
+ " FROM fac_groeprechten"
+ " WHERE fac_groep_key IN ({0})".format(record);
+ " WHERE fac_groep_key IN ({0})".format(record.join(","));
break;
case "fac_profiel": childsql = "SELECT fac_profielwaarde_key"
+ " FROM fac_profielwaarde"
+ " WHERE fac_profiel_key IN ({0})".format(record);
+ " WHERE fac_profiel_key IN ({0})".format(record.join(","));
break;
case "prs_kostensoort": childsql = "SELECT prs_kostencombinatie_key" // Huidige kosten combinaties.
+ " FROM prs_kostencombinatie"
+ " WHERE prs_kostensoort_key IN ({0})".format(record)
+ " WHERE prs_kostensoort_key IN ({0})".format(record.join(","))
+ " UNION "
+ "SELECT fac_audit_tabelkey" // Verwijderde kosten combinaties.
+ " FROM fac_audit"
+ " WHERE fac_audit_tabelnaam = 'prs_kostencombinatie'"
+ " AND fac_audit_waarde_oud IN ('{0}')".format(record);
+ " AND fac_audit_waarde_oud IN ('{1}')".format(record.join(","), record.join("','"));
break;
case "prs_perslid": childsql = "SELECT fac_audit_tabelkey"
+ " FROM fac_audit"
+ " WHERE fac_audit_tabelnaam = 'fac_gebruikersgroep'"
+ " AND fac_audit_waarde_oud IN ('{0}')".format(record);
+ " AND fac_audit_waarde_oud IN ('{0}')".format(record.join("','"));
break;
default : shared.simpel_page(L("lcl_internal_error")); // TODO: Abort en error geven.
}

2
APPL/SCF/scaffolding_show.inc
View File

@@ -124,7 +124,7 @@ function scaffolding_show(model, scf_params)
}
else if (model.audit && model.audit.childaudit && model.audit.childaudit.sql)
{
var sql = model.audit.childaudit.sql.format(parent_key_array.join(","));
var sql = model.audit.childaudit.sql.format(parent_key_array.join(","), parent_key_array.join("','"));
var oRs = Oracle.Execute(sql);
var child_key_array = [];
while(!oRs.eof)