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

FSN#53287 limit/offset gedrag bij api2 nog niet 100% correct

Browse Source 
svn path=/Website/trunk/; revision=38252
This commit is contained in:
Jos Groot Lipman
2018-06-19 11:22:03 +00:00
parent 09668a6c22
commit ca92bbeee5
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
APPL/API2/api2.inc
View File

@@ -1551,7 +1551,13 @@ function generic_REST_GET(model, gparams)
sql += ", " + inc0.table + "." + inc0.fields["id"].dbs;
}
var maxcnt = params.filter.showall==1?S("qp_maxrows2"):S("qp_maxrows");
if (params.filter.limit > 0)
maxcnt = params.filter.limit; // deze is in shared.inc/_qssafe 'safe' gemaakt
else
var maxcnt = params.filter.showall==1?S("qp_maxrows2"):S("qp_maxrows");
if (params.filter.offset > 0)
maxcnt += params.filter.offset; // deze is in shared.inc/_qssafe 'safe' gemaakt
if (params.include && params.include.length)
{
// geen beperking

4
APPL/Shared/Shared.inc
View File

@@ -230,6 +230,10 @@ var shared = {
else
return parseInt(strval, 10);
}
if (fld.toLowerCase() == 'limit')
return parseInt(strval, 10);
if (fld.toLowerCase() == 'offset')
return parseInt(strval, 10);
return strval; // NOTE: Rest nog even niet, gaf nog problemen met foreigns (FSN#33730)