DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 07:47:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge branch 'develop-v6-integration' of https://github.com/snipe/snipe-it into develop-v6-integration

Browse source
This commit is contained in:
snipe 2021-06-23 20:02:49 -07:00
parent 2e6bac7db5 71a53b3cbb
commit bdc285cebf
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

4
public/mix-manifest.json
View file

@ -1,5 +1,5 @@
{
"/js/build/app.js": "/js/build/app.js?id=ee4c16832f4e57724d24",
"/js/build/app.js": "/js/build/app.js?id=050aa61503e5a18e8f1c",
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=83e39e254b7f9035eddc",
"/css/build/overrides.css": "/css/build/overrides.css?id=b9b59d80509972c3b16a",
"/css/build/app.css": "/css/build/app.css?id=1da91ae0ff24d10b7207",
@ -26,7 +26,7 @@
"/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=93c24b4c89490bbfd73e",
"/js/build/vendor.js": "/js/build/vendor.js?id=651427cc4b45d8e68d0c",
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=5bbc20d77c1456cfc2ef",
"/js/dist/all.js": "/js/dist/all.js?id=a92af2190b95651745cf",
"/js/dist/all.js": "/js/dist/all.js?id=651427cc4b45d8e68d0c",
"/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=efda2335fa5243175850",
"/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=76cd718f22d841ba3632",
"/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=ec96c42439cdeb022133",

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

@ -201,7 +201,7 @@ $(document).ready(function () {
ajax: {
// the baseUrl includes a trailing slash
url: Ziggy.baseUrl + 'api/v1/' + endpoint + '/selectlist',
url: baseUrl + 'api/v1/' + endpoint + '/selectlist',
dataType: 'json',
delay: 250,
headers: {
@ -286,7 +286,7 @@ $(document).ready(function () {
var endpoint = element.data("endpoint");
var assetStatusType = element.data("asset-status-type");
$.ajax({
url: Ziggy.baseUrl + 'api/v1/' + endpoint + '/selectlist?search='+value+'&page=1' + (assetStatusType ? '&assetStatusType='+assetStatusType : ''),
url: baseUrl + 'api/v1/' + endpoint + '/selectlist?search='+value+'&page=1' + (assetStatusType ? '&assetStatusType='+assetStatusType : ''),
dataType: 'json',
headers: {
"X-Requested-With": 'XMLHttpRequest',

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

@ -54,7 +54,7 @@ $(function () {
ajax: {
// the baseUrl includes a trailing slash
url: Ziggy.baseUrl + 'api/v1/' + endpoint + '/selectlist',
url: baseUrl + 'api/v1/' + endpoint + '/selectlist', //WARNING - we're hoping that's defined on the page somewhere...
dataType: 'json',
delay: 250,
headers: {

2
resources/views/layouts/default.blade.php
View file

@ -74,7 +74,7 @@
};
</script>
<!-- Add laravel routes into javascript Primarily useful for vue.-->
@routes('vue_routes')
@routes
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<script src="{{ url(asset('js/html5shiv.js')) }}" nonce="{{ csrf_token() }}"></script>