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

Fix for #2946

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2021-07-27 01:01:49 -07:00
parent e55d04a2c6
commit 9113dc6963
37 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
views/default.handlebars
View file

@ -3867,16 +3867,16 @@
for (var j in node.tags) {
var tag = node.tags[j];
if (sort == 4) { if (mesh2) { tag = mesh2.name + ' - ' + node.tags[j]; } else { tag = '**INDV*~*DEVS** - ' + node.tags[j]; } }
var collapsed = CollapsedGroups['tag:' + tag];
var collapsed = CollapsedGroups['tag:' + encodeURIComponentEx(tag)];
var r2 = r.replace('**xx**xx*TaG*xx**xx**', encodeURIComponentEx(tag) + (collapsed?' style=display:none':''));
if (groups[tag] == null) { groups[tag] = r2; groupCount[tag] = 1; } else { groups[tag] += r2; groupCount[tag] += 1; }
if ((view == 3) || (view == 5)) break;
}
} else {
// If sorted by "Groups-Tags" and a device has not tags, put in a group only section.
// If sorted by "Groups-Tags" and a device has no tags, put in a group only section.
if ((sort == 4) && ((node.tags == null) || (node.tags.length == 0))) {
var tag = mesh2.name;
var collapsed = CollapsedGroups['tag:' + tag];
var collapsed = CollapsedGroups['tag:' + encodeURIComponentEx(tag)];
var r2 = r.replace('**xx**xx*TaG*xx**xx**', encodeURIComponentEx(tag) + (collapsed?' style=display:none':''));
if (groups[tag] == null) { groups[tag] = r2; groupCount[tag] = 1; } else { groups[tag] += r2; groupCount[tag] += 1; }
}
@ -4404,6 +4404,7 @@
putstore('_collapse', JSON.stringify(CollapsedGroups));
updateCollapseAllButton();
onDevicesScrollEx();
onDevicesScrollEx(); // TODO: Not sure why, but second call is needed for proper update
}
function toggleKvmDevice(node) {