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

FSN#38368 Telling voor Meer.... ook correct bij de merged-modellen zoals vakgroepen

Browse Source 
svn path=/Website/trunk/; revision=32220
This commit is contained in:
Jos Groot Lipman
2017-01-05 08:56:51 +00:00
parent bf2372e1bb
commit 68710db080
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
APPL/API2/api2.inc
View File

@@ -1130,6 +1130,12 @@ api2 = {
total_count ++;
data.push(record);
}
if ("merged_model" in model) // de disc_params truc
{
model.merged_model.limit = limit;
//model.offset = offset;
model.merged_model.total_count = total_count;
}
model.limit = limit;
//model.offset = offset;
model.total_count = total_count;
@@ -1245,8 +1251,9 @@ api2 = {
model.REST_PUT = generic_REST_PUT(model, gparams);
model.REST_DELETE = generic_REST_DELETE(model, gparams);
},
merge_disc_params_model: function(deze, template_model, tomodel)
merge_disc_params_model: function(deze, template_model)
{
template_model.merged_model = deze; // hebben we nodig om total_count te kunnen zetten
for (var x in template_model)
deze[x] = template_model[x];