external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-09 15:40:18 +00:00
Code Issues Releases Wiki Activity

Devices select all button will no longer select devices in collapsed groups.

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2022-07-29 11:12:43 -07:00
parent 994ed714da
commit 4dea7e435c
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
meshuser.js
View file

@ -4966,7 +4966,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
if ((mesh == null) || (mesh.mtype != 1) || (parent.GetMeshRights(user, command.meshid) & MESHRIGHT_EDITMESH) == 0) return null; // This user must have mesh rights to edit the device group if ((mesh == null) || (mesh.mtype != 1) || (parent.GetMeshRights(user, command.meshid) & MESHRIGHT_EDITMESH) == 0) return null; // This user must have mesh rights to edit the device group
var amtDevices = []; var amtDevices = [];
// Decode a JSON file from the Intel EMA migration tool // Decode a JSON file from the Intel SCS migration tool
if ((typeof command.amtdevices == 'object') && (typeof command.amtdevices.ApplicationData == 'object') && (command.amtdevices.ApplicationData.Application == 'Intel EMA Migration Tool') && (Array.isArray(command.amtdevices['Managed Systems']))) { if ((typeof command.amtdevices == 'object') && (typeof command.amtdevices.ApplicationData == 'object') && (command.amtdevices.ApplicationData.Application == 'Intel EMA Migration Tool') && (Array.isArray(command.amtdevices['Managed Systems']))) {
for (var i in command.amtdevices['Managed Systems']) { for (var i in command.amtdevices['Managed Systems']) {
const importDev = command.amtdevices['Managed Systems'][i]; const importDev = command.amtdevices['Managed Systems'][i];

4
views/default.handlebars
View file

@ -5413,8 +5413,10 @@
for (var i = 0; i < elements.length; i++) { elements[i].checked = (checkcount == 0); } for (var i = 0; i < elements.length; i++) { elements[i].checked = (checkcount == 0); }
checkedNodeids = {}; checkedNodeids = {};
if (checkcount == 0) { if (checkcount == 0) {
checkedNodeids = {};
var devdivs = document.getElementsByName('xxdevice' + Q('viewselect').value); var devdivs = document.getElementsByName('xxdevice' + Q('viewselect').value);
for (var i = 0; i < devdivs.length; i++) { checkedNodeids[devdivs[i].id.substring(3)] = 1; } // Checking that the parent style is null will insure that "select all" does not select any devices in collapsed groups
for (var i = 0; i < devdivs.length; i++) { if ((devdivs[i].parentElement.attributes.style == null) || (devdivs[i].parentElement.attributes.style.value.indexOf('display') < 0)) { checkedNodeids[devdivs[i].id.substring(3)] = 1; } }
} }
p1updateInfo(); p1updateInfo();
} }