Merge 2015.2 Gold C/D changes

svn path=/Website/trunk/; revision=26827
This commit is contained in:
Jos Groot Lipman
2015-10-29 15:17:48 +00:00
parent 9a27360fbb
commit 1ca35a54a7
20 changed files with 119 additions and 51 deletions

View File

@@ -112,6 +112,11 @@ function model_reportsx(usrrap_key, rapparams)
__Log(new_model);
};
this.hook_pre_edit = function (obj)
{
this.fields.styling.LOV = api2.filterLOV(L("lcl_usrrap_stylingLOV"), "0,1,2,3,8,16"); // De meesten mogen L(ike) niet
};
this.REST_GET = function _reportsx_GET(params, jsondata)
{
var query = api2.sqlfields(params, this);