From 99ec71b44e8bab8b7000858907ad32917595b66f Mon Sep 17 00:00:00 2001 From: Erik Groener Date: Tue, 18 Aug 2015 12:16:30 +0000 Subject: [PATCH] FSN#33498 Filters voor userraps zijn niet uit te zetten via de interface svn path=/Website/trunk/; revision=25994 --- APPL/API2/model_reportcolumns.inc | 59 ++++++++++++++++--------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/APPL/API2/model_reportcolumns.inc b/APPL/API2/model_reportcolumns.inc index b46dc76cd7..cee459eeae 100644 --- a/APPL/API2/model_reportcolumns.inc +++ b/APPL/API2/model_reportcolumns.inc @@ -51,35 +51,38 @@ function model_reportcolumns(usrrap_key, params) this.hook_pre_edit = function (obj) { this.fields.filter.LOV = api2.filterLOV(L("lcl_rap_filterLOV"), "A,E,R"); // De meesten mogen L(ike) niet - switch (obj.datatype.id) + if (obj.datatype) { - case "date": - case "datetime": - this.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G,D,W,M,Q,Y,H"); - this.fields.datatype.LOV = api2.filterLOV(L("lcl_rap_datatypeLOV"), "date,datetime,time"); - break; - case "time": - this.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G,H"); - this.fields.datatype.LOV = api2.filterLOV(L("lcl_rap_datatypeLOV"), "date,datetime,time"); - break; - case "varchar": - this.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G"); - this.fields.datatype.readonly = true; - this.fields.filter.LOV = L("lcl_rap_filterLOV"); // die mag alle filters - break; - case "html": - this.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G"); - this.fields.datatype.readonly = true; - this.fields.filter.LOV = L("lcl_rap_filterLOV"); - break; - case "float": - case "number": - case "currency": - this.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G,S,C,A"); - this.fields.datatype.LOV = api2.filterLOV(L("lcl_rap_datatypeLOV"), "float,currency,number"); - break; - default: - this.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G"); + switch (obj.datatype.id) + { + case "date": + case "datetime": + this.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G,D,W,M,Q,Y,H"); + this.fields.datatype.LOV = api2.filterLOV(L("lcl_rap_datatypeLOV"), "date,datetime,time"); + break; + case "time": + this.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G,H"); + this.fields.datatype.LOV = api2.filterLOV(L("lcl_rap_datatypeLOV"), "date,datetime,time"); + break; + case "varchar": + this.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G"); + this.fields.datatype.readonly = true; + this.fields.filter.LOV = L("lcl_rap_filterLOV"); // die mag alle filters + break; + case "html": + this.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G"); + this.fields.datatype.readonly = true; + this.fields.filter.LOV = L("lcl_rap_filterLOV"); + break; + case "float": + case "number": + case "currency": + this.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G,S,C,A"); + this.fields.datatype.LOV = api2.filterLOV(L("lcl_rap_datatypeLOV"), "float,currency,number"); + break; + default: + this.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G"); + } } };