Ylianst/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-26 07:23:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tag search case issue, #3136

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2021-09-15 19:12:10 -07:00
parent a75af8aa44
commit c811fc6f16
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meshctrl.js
View File

@ -2211,7 +2211,8 @@ function getDevicesThatMatchFilter(nodes, x) {
} else if (tagSearch != null) {
// Tag filter
for (var d in nodes) {
if (((nodes[d].tags == null) && (tagSearch == '')) || ((nodes[d].tags != null) && (nodes[d].tags.indexOf(tagSearch) >= 0))) { r.push(nodes[d]); }
if ((nodes[d].tags == null) && (tagSearch == '')) { r.push(d); }
else if (nodes[d].tags != null) { for (var j in nodes[d].tags) { if (nodes[d].tags[j].toLowerCase() == tagSearch) { r.push(d); break; } } }
}
} else if (agentTagSearch != null) {
// Agent Tag filter

5
views/default.handlebars
View File

@ -5472,14 +5472,15 @@
for (var d in nodes) { r.push(d); }
} else if (ipSearch != null) {
// IP address search
for (var d in nodes) { if ((nodes[d].ip != null) && (nodes[d].ip.indexOf(ipSearch) >= 0)) { r.push(d); } }
for (var d in nodes) { if ((nodes[d].ip != null) && (nodes[d].ip.toLowerCase().indexOf(ipSearch) >= 0)) { r.push(d); } }
} else if (groupSearch != null) {
// Group filter
for (var d in nodes) { if (meshes[nodes[d].meshid].name.toLowerCase().indexOf(groupSearch) >= 0) { r.push(d); } }
} else if (tagSearch != null) {
// Tag filter
for (var d in nodes) {
if (((nodes[d].tags == null) && (tagSearch == '')) || ((nodes[d].tags != null) && (nodes[d].tags.indexOf(tagSearch) >= 0))) { r.push(d); }
if ((nodes[d].tags == null) && (tagSearch == '')) { r.push(d); }
else if (nodes[d].tags != null) { for (var j in nodes[d].tags) { if (nodes[d].tags[j].toLowerCase() == tagSearch) { r.push(d); break; } }}
}
} else if (agentTagSearch != null) {
// Agent Tag filter