DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 05:47:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Switch to 'items' to maintain compatbility with other internal API's

Browse source
This commit is contained in:
Brady Wetherington 2020-07-13 21:12:03 -07:00
parent e7a820f7c9
commit 17f6fbabfa
10 changed files with 14 additions and 14 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,

BIN
public/css/build/all.css
View file

Binary file not shown.

BIN
public/css/dist/all.css vendored
View file

Binary file not shown.

BIN
public/js/build/all.js
View file

Binary file not shown.

BIN
public/js/build/vue.js
View file

Binary file not shown.

BIN
public/js/build/vue.js.map
View file

Binary file not shown.

BIN
public/js/dist/all.js vendored
View file

Binary file not shown.

12
public/mix-manifest.json
View file

@ -1,5 +1,5 @@
{ {
"/js/build/vue.js": "/js/build/vue.js?id=e3e396dd72e00e2cb0c0", "/js/build/vue.js": "/js/build/vue.js?id=461ae9803574a5a52d43",
"/css/AdminLTE.css": "/css/AdminLTE.css?id=56b8066cfbc70df10545", "/css/AdminLTE.css": "/css/AdminLTE.css?id=56b8066cfbc70df10545",
"/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405", "/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405",
"/css/overrides.css": "/css/overrides.css?id=d1fe6296eb548247a5ad", "/css/overrides.css": "/css/overrides.css?id=d1fe6296eb548247a5ad",
@ -18,7 +18,7 @@
"/css/skins/skin-blue-dark.css": "/css/skins/skin-blue-dark.css?id=d25c77d9c6f4cfe2efd4", "/css/skins/skin-blue-dark.css": "/css/skins/skin-blue-dark.css?id=d25c77d9c6f4cfe2efd4",
"/css/skins/skin-orange-dark.css": "/css/skins/skin-orange-dark.css?id=abc219c1fed59cecb860", "/css/skins/skin-orange-dark.css": "/css/skins/skin-orange-dark.css?id=abc219c1fed59cecb860",
"/css/skins/skin-orange.css": "/css/skins/skin-orange.css?id=59664dbd286988d2a438", "/css/skins/skin-orange.css": "/css/skins/skin-orange.css?id=59664dbd286988d2a438",
"/js/build/vue.js.map": "/js/build/vue.js.map?id=0e924fc4c62d0c99f7ec", "/js/build/vue.js.map": "/js/build/vue.js.map?id=1760ae00d44238e44172",
"/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=5a2d6f3c59191ce716e2", "/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=5a2d6f3c59191ce716e2",
"/css/app.css.map": "/css/app.css.map?id=96b5c985e860716e6a16", "/css/app.css.map": "/css/app.css.map?id=96b5c985e860716e6a16",
"/css/overrides.css.map": "/css/overrides.css.map?id=f3e3cf42859eb4a28a7b", "/css/overrides.css.map": "/css/overrides.css.map?id=f3e3cf42859eb4a28a7b",
@ -37,8 +37,8 @@
"/css/skins/skin-blue-dark.css.map": "/css/skins/skin-blue-dark.css.map?id=32784cb5d02773eb0e69", "/css/skins/skin-blue-dark.css.map": "/css/skins/skin-blue-dark.css.map?id=32784cb5d02773eb0e69",
"/css/skins/skin-orange-dark.css.map": "/css/skins/skin-orange-dark.css.map?id=68b998638217fd08ef29", "/css/skins/skin-orange-dark.css.map": "/css/skins/skin-orange-dark.css.map?id=68b998638217fd08ef29",
"/css/skins/skin-orange.css.map": "/css/skins/skin-orange.css.map?id=f90fda3cc0a48c048a9e", "/css/skins/skin-orange.css.map": "/css/skins/skin-orange.css.map?id=f90fda3cc0a48c048a9e",
"/css/dist/all.css": "/css/dist/all.css?id=8914ab6c43541879ad79", "/css/dist/all.css": "/css/dist/all.css?id=0491555899142b86167d",
"/js/dist/all.js": "/js/dist/all.js?id=47b2be5a7782307280bc", "/js/dist/all.js": "/js/dist/all.js?id=4513ccdd4533b52922a8",
"/css/build/all.css": "/css/build/all.css?id=8914ab6c43541879ad79", "/css/build/all.css": "/css/build/all.css?id=0491555899142b86167d",
"/js/build/all.js": "/js/build/all.js?id=47b2be5a7782307280bc" "/js/build/all.js": "/js/build/all.js?id=4513ccdd4533b52922a8"
} }

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

@ -217,19 +217,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

@ -67,19 +67,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