Fix for #2946
Ylian Saint-Hilaire committed
Jul 27, 2021 at 01:01 UTC
9113dc6963aaa5f01b803fb0a644ed97f3505a27
37 files changed
+4
-3
agents/MeshCmd-signed.exe
Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ
agents/MeshCmd64-signed.exe
Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ
agents/MeshService-signed.exe
Binary files a/agents/MeshService-signed.exe and b/agents/MeshService-signed.exe differ
agents/MeshService.exe
Binary files a/agents/MeshService.exe and b/agents/MeshService.exe differ
agents/MeshService64-signed.exe
Binary files a/agents/MeshService64-signed.exe and b/agents/MeshService64-signed.exe differ
agents/MeshService64.exe
Binary files a/agents/MeshService64.exe and b/agents/MeshService64.exe differ
agents/agents-new/MeshService.exe
Binary files a/agents/agents-new/MeshService.exe and /dev/null differ
agents/agents-new/MeshService64.exe
Binary files a/agents/agents-new/MeshService64.exe and /dev/null differ
agents/agents-old/MeshCmd-signed.exe
Binary files a/agents/agents-old/MeshCmd-signed.exe and /dev/null differ
agents/agents-old/MeshCmd64-signed.exe
Binary files a/agents/agents-old/MeshCmd64-signed.exe and /dev/null differ
agents/agents-old/MeshService-signed.exe
Binary files a/agents/agents-old/MeshService-signed.exe and /dev/null differ
agents/agents-old/MeshService.exe
Binary files a/agents/agents-old/MeshService.exe and /dev/null differ
agents/agents-old/MeshService64-signed.exe
Binary files a/agents/agents-old/MeshService64-signed.exe and /dev/null differ
agents/agents-old/MeshService64.exe
Binary files a/agents/agents-old/MeshService64.exe and /dev/null differ
agents/meshagent_aarch64
renamed
agents/meshagent_aarch64-cortex-a53
renamed
agents/meshagent_alpine-x86-64
renamed
agents/meshagent_arm
renamed
agents/meshagent_arm-linaro
renamed
agents/meshagent_arm64
renamed
agents/meshagent_armhf
renamed
agents/meshagent_armhf2
renamed
agents/meshagent_freebsd_x86-64
renamed
agents/meshagent_mips
renamed
agents/meshagent_mips24kc
renamed
agents/meshagent_mipsel24kc
renamed
agents/meshagent_osx-arm-64
renamed
agents/meshagent_osx-universal-64
renamed
agents/meshagent_osx-x86-64
renamed
agents/meshagent_pogo
renamed
agents/meshagent_poky
renamed
agents/meshagent_poky64
renamed
agents/meshagent_x86
renamed
agents/meshagent_x86-64
renamed
agents/meshagent_x86-64_nokvm
renamed
agents/meshagent_x86_nokvm
renamed
views/default.handlebars
+4
-3
@@ -3867,16 +3867,16 @@
3867
for (var j in node.tags) {
3868
var tag = node.tags[j];
3869
if (sort == 4) { if (mesh2) { tag = mesh2.name + ' - ' + node.tags[j]; } else { tag = '**INDV*~*DEVS** - ' + node.tags[j]; } }
3870
- var collapsed = CollapsedGroups['tag:' + tag];
3870
+ var collapsed = CollapsedGroups['tag:' + encodeURIComponentEx(tag)];
3871
var r2 = r.replace('**xx**xx*TaG*xx**xx**', encodeURIComponentEx(tag) + (collapsed?' style=display:none':''));
3872
if (groups[tag] == null) { groups[tag] = r2; groupCount[tag] = 1; } else { groups[tag] += r2; groupCount[tag] += 1; }
3873
if ((view == 3) || (view == 5)) break;
3874
}
3875
} else {
3876
- // If sorted by "Groups-Tags" and a device has not tags, put in a group only section.
3876
+ // If sorted by "Groups-Tags" and a device has no tags, put in a group only section.
3877
if ((sort == 4) && ((node.tags == null) || (node.tags.length == 0))) {
3878
var tag = mesh2.name;
3879
- var collapsed = CollapsedGroups['tag:' + tag];
3879
+ var collapsed = CollapsedGroups['tag:' + encodeURIComponentEx(tag)];
3880
var r2 = r.replace('**xx**xx*TaG*xx**xx**', encodeURIComponentEx(tag) + (collapsed?' style=display:none':''));
3881
if (groups[tag] == null) { groups[tag] = r2; groupCount[tag] = 1; } else { groups[tag] += r2; groupCount[tag] += 1; }
3882
}
@@ -4404,6 +4404,7 @@
4404
putstore('_collapse', JSON.stringify(CollapsedGroups));
4405
updateCollapseAllButton();
4406
onDevicesScrollEx();
4407
+ onDevicesScrollEx(); // TODO: Not sure why, but second call is needed for proper update
4408
}
4409
4410
function toggleKvmDevice(node) {