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

FSN#35587 Verplicht kunnen maken UDR filters

Browse Source 
svn path=/Website/trunk/; revision=40421
This commit is contained in:
Erik Groener
2019-01-08 09:42:07 +00:00
parent 467bc109f0
commit ed7c758f42
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/API2/model_reportcolumns.inc
View File

@@ -127,7 +127,7 @@ function model_reportcolumns(usrrap_key, params)
this.hook_pre_edit = function (obj, fld)
{
this.fields.filter.LOV = api2.filterLOV(L("lcl_rap_filterLOV"), "A,E,R"); // De meesten mogen L(ike) niet
this.fields.filter.LOV = api2.filterLOV(L("lcl_rap_filterLOV"), "A,E,R,RR"); // De meesten mogen L(ike) niet
if ((obj.datatype && !obj.expression) || !user.has("WEB_FACTAB"))
{
switch (obj.datatype.id)

4
APPL/API2/model_reports.inc
View File

@@ -285,7 +285,9 @@ function model_reports(fac_usrrap_key)
}
else
{
field.filter = api2.splitLOV("E;exact;L;like;R;range")[usrrap.columns[i].filter.id]
field.filter = api2.splitLOV("E;exact;L;like;R;range")[usrrap.columns[i].filter.id.substr(0,1)]; // voor filter alleen de eerste letter.
if (usrrap.columns[i].filter.id.substr(1,1) == "R") // als 2e letter een R is dan is filter verplicht
field.filterrequired = true;
}
field.filterdefault = usrrap.columns[i].filterdefault;
}

4
APPL/SCF/scaffolding_search.inc
View File

@@ -106,9 +106,9 @@ function scf_search_field (model, fld, defaults, scf_params, includefilters)
{
var org_label = field.label;
field.label = org_label + " " + (field.typ == "date" ? L("lcl_period_from") : L("lcl_from"));
scf_RWFIELDTR(xmodel, "start_" + fld, defs.vmin, null, {search: true});
scf_RWFIELDTR(xmodel, "start_" + fld, defs.vmin, null, {search: true, required: field.filterrequired});
field.label = org_label + " " + (field.typ == "date" ? L("lcl_period_to") : L("lcl_to"));
scf_RWFIELDTR(xmodel, "end_" + fld, defs.vmax, null, {search: true});
scf_RWFIELDTR(xmodel, "end_" + fld, defs.vmax, null, {search: true, required: field.filterrequired});
field.label = org_label;
}
}