mirror of
https://github.com/Ylianst/MeshCentral.git
synced 2025-11-07 12:52:54 -05:00
Added device group name to search results as config option (#5544)
This commit is contained in:
@@ -2904,12 +2904,24 @@
|
||||
var rs = x.split(/\s+/).join('|'), rx = new RegExp(rs); // In some cases (like +), this can throw an exception.
|
||||
for (var d in nodes) {
|
||||
if (features2 & 0x00008000) {
|
||||
nodes[d].v = (rx.test(nodes[d].name.toLowerCase())) || ((nodes[d].rnamel != null) && rx.test(nodes[d].rnamel.toLowerCase()));
|
||||
if(features2 & 0x10000000){
|
||||
nodes[d].v = (rx.test(nodes[d].name.toLowerCase())) || (rx.test(meshes[nodes[d].meshid].name.toLowerCase())) || ((nodes[d].rnamel != null) && rx.test(nodes[d].rnamel.toLowerCase()));
|
||||
}else {
|
||||
nodes[d].v = (rx.test(nodes[d].name.toLowerCase())) || ((nodes[d].rnamel != null) && rx.test(nodes[d].rnamel.toLowerCase()));
|
||||
}
|
||||
} else {
|
||||
if (showRealNames) {
|
||||
nodes[d].v = (nodes[d].rnamel != null) && rx.test(nodes[d].rnamel.toLowerCase());
|
||||
} else {
|
||||
nodes[d].v = rx.test(nodes[d].name.toLowerCase());
|
||||
if(features2 & 0x10000000){
|
||||
if (showRealNames) {
|
||||
nodes[d].v = (nodes[d].rnamel != null) && rx.test(nodes[d].rnamel.toLowerCase()) || (rx.test(meshes[nodes[d].meshid].name.toLowerCase()));
|
||||
} else {
|
||||
nodes[d].v = rx.test(nodes[d].name.toLowerCase()) || (rx.test(meshes[nodes[d].meshid].name.toLowerCase()));
|
||||
}
|
||||
}else{
|
||||
if (showRealNames) {
|
||||
nodes[d].v = (nodes[d].rnamel != null) && rx.test(nodes[d].rnamel.toLowerCase());
|
||||
} else {
|
||||
nodes[d].v = rx.test(nodes[d].name.toLowerCase());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user