cphipps/lubelog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #845 from hargata/Hargata/780

Browse Source 
further hardening.
This commit is contained in:
Hargata Softworks
2025-02-05 16:28:38 -07:00
committed by GitHub
parent 54f5062377 76c6753785
commit b9ffa6ce91
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wwwroot/js/shared.js
View File

@@ -1391,7 +1391,9 @@ function loadUserColumnPreferences(columns, order) {
//re-order items in menu //re-order items in menu
var itemToMove = $(`[data-column-toggle='${x}'].col-visible-toggle`).closest('.dropdown-item'); var itemToMove = $(`[data-column-toggle='${x}'].col-visible-toggle`).closest('.dropdown-item');
var itemCurrentlyInPosition = $('.dropdown-item[draggable="true"]')[y]; var itemCurrentlyInPosition = $('.dropdown-item[draggable="true"]')[y];
itemToMove.insertBefore(itemCurrentlyInPosition); if (itemToMove != undefined && itemCurrentlyInPosition != undefined) {
itemToMove.insertBefore(itemCurrentlyInPosition);
}
//re-order table columns //re-order table columns
$(`[data-column='${x}']`).css('order', y); $(`[data-column='${x}']`).css('order', y);
}); });
@@ -1399,14 +1401,16 @@ function loadUserColumnPreferences(columns, order) {
function saveUserColumnPreferences(importMode) { function saveUserColumnPreferences(importMode) {
var visibleColumns = $('.col-visible-toggle:checked').map((index, elem) => $(elem).attr('data-column-toggle')).toArray(); var visibleColumns = $('.col-visible-toggle:checked').map((index, elem) => $(elem).attr('data-column-toggle')).toArray();
var columnOrder = []; var columnOrder = [];
var sortedOrderedTabs = $("ul.dropdown-menu > li[draggable='true']").toArray().sort((a, b) => { var sortedOrderedColumns = $("ul.dropdown-menu > li[draggable='true']").toArray().sort((a, b) => {
var currentVal = $(a).css("order"); var currentVal = $(a).css("order");
var nextVal = $(b).css("order"); var nextVal = $(b).css("order");
return currentVal - nextVal; return currentVal - nextVal;
}); });
sortedOrderedTabs.map(elem => { sortedOrderedColumns.map(elem => {
var elemName = $(elem).find('.col-visible-toggle').attr("data-column-toggle"); var columnOrderName = $(elem).find('.col-visible-toggle').attr("data-column-toggle");
columnOrder.push(elemName); if (columnOrderName != null && columnOrderName != undefined) {
columnOrder.push(columnOrderName);
}
}); });
var columnPreference = { var columnPreference = {
tab: importMode, tab: importMode,