lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fixed regression that disabled sticky headers

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2023-09-15 20:28:28 +01:00
parent eb406547c4
commit 3ba8b60f54
6 changed files with 1928 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1295,12 +1295,16 @@ $(document).ready(function () {
$('#assigned_user').hide(); $('#assigned_user').hide();
$('#assigned_location').hide(); $('#assigned_location').hide();
$('.notification-callout').fadeOut(); $('.notification-callout').fadeOut();
$('[name="assigned_location"]').val('').trigger('change.select2');
$('[name="assigned_user"]').val('').trigger('change.select2');
} else if (assignto_type == 'location') { } else if (assignto_type == 'location') {
$('#current_assets_box').fadeOut(); $('#current_assets_box').fadeOut();
$('#assigned_asset').hide(); $('#assigned_asset').hide();
$('#assigned_user').hide(); $('#assigned_user').hide();
$('#assigned_location').show(); $('#assigned_location').show();
$('.notification-callout').fadeOut(); $('.notification-callout').fadeOut();
$('[name="assigned_asset"]').val('').trigger('change.select2');
$('[name="assigned_user"]').val('').trigger('change.select2');
} else { } else {
$('#assigned_asset').hide(); $('#assigned_asset').hide();
$('#assigned_user').show(); $('#assigned_user').show();
@ -1311,6 +1315,8 @@ $(document).ready(function () {
} }
$('.notification-callout').fadeIn(); $('.notification-callout').fadeIn();
$('[name="assigned_asset"]').val('').trigger('change.select2');
$('[name="assigned_location"]').val('').trigger('change.select2');
} }
}); });
}); // ------------------------------------------------ }); // ------------------------------------------------

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

@ -59920,12 +59920,16 @@ $(document).ready(function () {
$('#assigned_user').hide(); $('#assigned_user').hide();
$('#assigned_location').hide(); $('#assigned_location').hide();
$('.notification-callout').fadeOut(); $('.notification-callout').fadeOut();
$('[name="assigned_location"]').val('').trigger('change.select2');
$('[name="assigned_user"]').val('').trigger('change.select2');
} else if (assignto_type == 'location') { } else if (assignto_type == 'location') {
$('#current_assets_box').fadeOut(); $('#current_assets_box').fadeOut();
$('#assigned_asset').hide(); $('#assigned_asset').hide();
$('#assigned_user').hide(); $('#assigned_user').hide();
$('#assigned_location').show(); $('#assigned_location').show();
$('.notification-callout').fadeOut(); $('.notification-callout').fadeOut();
$('[name="assigned_asset"]').val('').trigger('change.select2');
$('[name="assigned_user"]').val('').trigger('change.select2');
} else { } else {
$('#assigned_asset').hide(); $('#assigned_asset').hide();
$('#assigned_user').show(); $('#assigned_user').show();
@ -59936,6 +59940,8 @@ $(document).ready(function () {
} }
$('.notification-callout').fadeIn(); $('.notification-callout').fadeIn();
$('[name="assigned_asset"]').val('').trigger('change.select2');
$('[name="assigned_location"]').val('').trigger('change.select2');
} }
}); });
}); // ------------------------------------------------ }); // ------------------------------------------------

1909
public/js/dist/bootstrap-table.js vendored
View file

File diff suppressed because it is too large Load diff

6
public/mix-manifest.json
View file

@ -1,5 +1,5 @@
{ {
"/js/build/app.js": "/js/build/app.js?id=82ddaa718cced6fb0be6e8db6f16a0c0", "/js/build/app.js": "/js/build/app.js?id=b52b79848c81c9b523b9dd92baf6a41e",
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374",
"/css/build/overrides.css": "/css/build/overrides.css?id=5166569ede5a36802eadeea982686ca6", "/css/build/overrides.css": "/css/build/overrides.css?id=5166569ede5a36802eadeea982686ca6",
"/css/build/app.css": "/css/build/app.css?id=b612c48e78fece2e1e8042ae24cc5f1e", "/css/build/app.css": "/css/build/app.css?id=b612c48e78fece2e1e8042ae24cc5f1e",
@ -31,8 +31,8 @@
"/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=d36941873b661076f146b0221f13497d", "/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=d36941873b661076f146b0221f13497d",
"/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=281bcfe26549412d128f695234961081", "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=281bcfe26549412d128f695234961081",
"/js/build/vendor.js": "/js/build/vendor.js?id=3592e07ae9a6d1805a4ea3bd3c034aef", "/js/build/vendor.js": "/js/build/vendor.js?id=3592e07ae9a6d1805a4ea3bd3c034aef",
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=df78f0c4cc93c29c02a41144590f6350", "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=52d208bde3fe141c99125b883c4528a0",
"/js/dist/all.js": "/js/dist/all.js?id=ba07d399f23b294f7c4983030b757423", "/js/dist/all.js": "/js/dist/all.js?id=6c6c0361d29ca2eb43b53cd442a84aef",
"/js/dist/all-defer.js": "/js/dist/all-defer.js?id=07e52318da2cdf3171c4d88113f25fb6", "/js/dist/all-defer.js": "/js/dist/all-defer.js?id=07e52318da2cdf3171c4d88113f25fb6",
"/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=0a82a6ae6bb4e58fe62d162c4fb50397",
"/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=e36e83c2aa3c3afdbb8ebe2c0309e91d", "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=e36e83c2aa3c3afdbb8ebe2c0309e91d",

3
resources/views/partials/bootstrap-table.blade.php
View file

@ -51,8 +51,9 @@
} }
}, },
stickyHeader: true, stickyHeader: true,
stickyHeaderOffsetLeft: parseInt($('body').css('padding-left'), 10),
stickyHeaderOffsetRight: parseInt($('body').css('padding-right'), 10),
locale: locale, locale: locale,
stickyHeaderOffsetY: stickyHeaderOffsetY + 'px',
undefinedText: '', undefinedText: '',
iconsPrefix: 'fa', iconsPrefix: 'fa',
cookieStorage: '{{ config('session.bs_table_storage') }}', cookieStorage: '{{ config('session.bs_table_storage') }}',

3
webpack.mix.js
View file

@ -142,7 +142,7 @@ mix
.combine( .combine(
[ [
"./node_modules/bootstrap-table/dist/bootstrap-table.css", "./node_modules/bootstrap-table/dist/bootstrap-table.css",
"./node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.css", "./node_modules/bootstrap-table/dist//extensions/sticky-header/bootstrap-table-sticky-header.css",
], ],
"public/css/dist/bootstrap-table.css" "public/css/dist/bootstrap-table.css"
) )
@ -184,6 +184,7 @@ mix
'./node_modules/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile.js', './node_modules/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile.js',
'./node_modules/bootstrap-table/dist/extensions/export/bootstrap-table-export.js', './node_modules/bootstrap-table/dist/extensions/export/bootstrap-table-export.js',
'./node_modules/bootstrap-table/dist/extensions/cookie/bootstrap-table-cookie.js', './node_modules/bootstrap-table/dist/extensions/cookie/bootstrap-table-cookie.js',
'./node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.js',
'./resources/assets/js/extensions/jquery.base64.js', './resources/assets/js/extensions/jquery.base64.js',
'./node_modules/tableexport.jquery.plugin/tableExport.min.js', './node_modules/tableexport.jquery.plugin/tableExport.min.js',
'./node_modules/tableexport.jquery.plugin/libs/jsPDF/jspdf.umd.min.js', './node_modules/tableexport.jquery.plugin/libs/jsPDF/jspdf.umd.min.js',