From 44f26d8e80200201f3711b4849a53a31f3370f99 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sat, 31 Dec 2022 00:04:55 +1100 Subject: [PATCH] Parameters table fix (#4120) (#4121) * Account for paginated or unpaginated results * Fix data loading when paginated - Server-side paginated data needs to be provided in the correct format - Look at how the original data were provided by the server - Perform a single data load operation at the end (cherry picked from commit 717a6ba5d209a1d546a60aa7329f40222c6d4437) --- InvenTree/templates/js/translated/part.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/InvenTree/templates/js/translated/part.js b/InvenTree/templates/js/translated/part.js index 90a075aca6..cd8d6e9484 100644 --- a/InvenTree/templates/js/translated/part.js +++ b/InvenTree/templates/js/translated/part.js @@ -1333,7 +1333,8 @@ function loadParametricPartTable(table, options={}) { uniqueId: 'pk', onLoadSuccess: function(response) { - var data = response.results; + // Data may be returned paginated, in which case we preference response.results + var data = response.results || response; for (var idx = 0; idx < data.length; idx++) { var row = data[idx]; @@ -1346,8 +1347,14 @@ function loadParametricPartTable(table, options={}) { data[idx] = row; } + if (response.results) { + response.results = data; + } else { + response = data; + } + // Update the table - $(table).bootstrapTable('load', data); + $(table).bootstrapTable('load', response); } }); }