DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Changed selectlist results to be 'items' for internal consistency

Browse source
This commit is contained in:
Brady Wetherington 2020-07-16 15:33:38 -07:00
parent 318da67230
commit 68263ff806
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Transformers/SelectlistTransformer.php
View file

@ -33,7 +33,7 @@ class SelectlistTransformer
} }
$results = [ $results = [
'results' => $items_array, 'items' => $items_array,
'pagination' => 'pagination' =>
[ [
'more' => ($select_items->currentPage() >= $select_items->lastPage()) ? false : true, 'more' => ($select_items->currentPage() >= $select_items->lastPage()) ? false : true,

6
resources/assets/js/snipeit.js
View file

@ -212,19 +212,19 @@ $(document).ready(function () {
}; };
return data; return data;
}, },
/* processResults: function (data, params) { processResults: function (data, params) {
params.page = params.page || 1; params.page = params.page || 1;
var answer = { var answer = {
results: data.items, results: data.items,
pagination: { pagination: {
more: "true" //(params.page < data.page_count) more: data.pagination.more
} }
}; };
return answer; return answer;
}, */ },
cache: true cache: true
}, },
escapeMarkup: function (markup) { return markup; }, // let our custom formatter work escapeMarkup: function (markup) { return markup; }, // let our custom formatter work

6
resources/assets/js/snipeit_modals.js
View file

@ -69,19 +69,19 @@ $(function () {
}; };
return data; return data;
}, },
/* processResults: function (data, params) { processResults: function (data, params) {
params.page = params.page || 1; params.page = params.page || 1;
var answer = { var answer = {
results: data.items, results: data.items,
pagination: { pagination: {
more: "true" //(params.page < data.page_count) more: data.pagination.more
} }
}; };
return answer; return answer;
}, */ },
cache: true cache: true
}, },
escapeMarkup: function (markup) { return markup; }, // let our custom formatter work escapeMarkup: function (markup) { return markup; }, // let our custom formatter work