Merge 2017.1 Gold B patches

svn path=/Website/trunk/; revision=34303
This commit is contained in:
Jos Groot Lipman
2017-06-15 15:02:54 +00:00
parent 704f21899d
commit 284aadb8fb
54 changed files with 857 additions and 527 deletions

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)