From 736fffbe26946841c3e31135d2639cac03b52c85 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Wed, 4 Aug 2021 20:43:04 -0700 Subject: [PATCH] Fixed device group sort when device group names are the same. --- views/default.handlebars | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/views/default.handlebars b/views/default.handlebars index 92972d9a..ba6aff32 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -5313,7 +5313,15 @@ } function nameSort(a, b) { var aa = a.name.toLowerCase(), bb = b.name.toLowerCase(); if (aa > bb) return 1; if (aa < bb) return -1; return 0; } - function meshSort(a, b) { if (a.meshnamel > b.meshnamel) return 1; if (a.meshnamel < b.meshnamel) return -1; if (a.meshid == b.meshid) { if (showRealNames == true) { if (a.rnamel > b.rnamel) return 1; if (a.rnamel < b.rnamel) return -1; return 0; } else { if (a.namel > b.namel) return 1; if (a.namel < b.namel) return -1; return 0; } } return 0; } + function meshSort(a, b) { + if (a.meshnamel > b.meshnamel) return 1; + if (a.meshnamel < b.meshnamel) return -1; + if (a.meshid > b.meshid) return 1; + if (a.meshid < b.meshid) return -1; + if (showRealNames == true) { if (a.rnamel > b.rnamel) return 1; if (a.rnamel < b.rnamel) return -1; return 0; } + else { if (a.namel > b.namel) return 1; if (a.namel < b.namel) return -1; } + return 0; + } function powerSort(a, b) { var ap = a.pwr?a.pwr:0; var bp = b.pwr?b.pwr:0; if (ap > bp) return -1; if (ap < bp) return 1; if (ap == bp) { if (showRealNames == true) { if (a.rnamel > b.rnamel) return 1; if (a.rnamel < b.rnamel) return -1; return 0; } else { if (a.namel > b.namel) return 1; if (a.namel < b.namel) return -1; return 0; } } return 0; } function deviceSort(a, b) { if (a.namel > b.namel) return 1; if (a.namel < b.namel) return -1; return 0; } function deviceHostSort(a, b) { if (a.rnamel > b.rnamel) return 1; if (a.rnamel < b.rnamel) return -1; return 0; }