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

FSN#38916 FACFAC Superuser alle tabellen kunnen bekijken beter met foreigns

Browse Source 
svn path=/Website/branches/v2016.3/; revision=32556
This commit is contained in:
Jos Groot Lipman
2017-01-25 21:29:17 +00:00
parent bb353065c4
commit 63f52d0a1f
1 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
APPL/SCF/scaffolding.inc
View File

@@ -280,10 +280,6 @@ function scf_RWFIELDTR(model, fld, val, key, params)
return scf_ROFIELDTR(model, fld, val);
}
// we doen automatische listboxen maar vanuit model_generic kan dat te gortig worden
if (field.foreign && params.search && "num_rows" in field && field.num_rows > 1000) /* of S("qp_maxrows") */
field.foreign = null;
if (field.foreign)
{
if (typeof field.foreign == 'function')
@@ -397,31 +393,39 @@ function scf_RWFIELDTR(model, fld, val, key, params)
}
else // dan maar gewone select
{
var sql = "SELECT " + foreign.key
+ " , " + foreign.desc
+ " FROM " + foreign.tbl + " " + (foreign.alias||"")
+ (foreign.where?" WHERE " + foreign.where:"")
+ " ORDER BY 2";
var emptyOption = "";
if (!params.search)
// we doen automatische listboxen maar vanuit model_generic kan dat te gortig worden
if (params.search && "num_rows" in field && field.num_rows > 1000) /* of S("qp_maxrows") */
{
if ("emptyoption" in field)
emptyOption = field.emptyoption;
else
if (val && val.id && params.required)
emptyOption = null;
field.foreign = null;
}
if (val && typeof val == "object" && "id" in val)
{ // dereference
val = val.id;
else
{
var sql = "SELECT " + foreign.key
+ " , " + foreign.desc
+ " FROM " + foreign.tbl + " " + (foreign.alias||"")
+ (foreign.where?" WHERE " + foreign.where:"")
+ " ORDER BY 2";
var emptyOption = "";
if (!params.search)
{
if ("emptyoption" in field)
emptyOption = field.emptyoption;
else
if (val && val.id && params.required)
emptyOption = null;
}
if (val && typeof val == "object" && "id" in val)
{ // dereference
val = val.id;
}
FCLTselector(fld, sql, { label: field.label,
initKey: val||null,
emptyOption: emptyOption,
emptyKey: (field.typ=="key"?-1:""),
readonly: (foreign.readonly?foreign.readonly:false),
required: params.required
});
}
FCLTselector(fld, sql, { label: field.label,
initKey: val||null,
emptyOption: emptyOption,
emptyKey: (field.typ=="key"?-1:""),
readonly: (foreign.readonly?foreign.readonly:false),
required: params.required
});
}
}
}