From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 1 Mar 2021 09:42:10 +0000 (+0100)
Subject: luci-base: network.js: sort interface statuses by metric, then name
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ee07c302073db861766e376c6362daf48c6f97b9;p=project%2Fluci.git

luci-base: network.js: sort interface statuses by metric, then name

Fixes: #4693
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0ee422b4c0e266f0ece70fa60e0ebfa84851992e)
---

diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js
index 5c6d732d67..80d413e4d4 100644
--- a/modules/luci-base/htdocs/luci-static/resources/network.js
+++ b/modules/luci-base/htdocs/luci-static/resources/network.js
@@ -1437,6 +1437,18 @@ Network = baseclass.extend(/** @lends LuCI.network.prototype */ {
 				}
 			}
 
+			rv.sort(function(a, b) {
+				if (a.metric != b.metric)
+					return (a.metric - b.metric);
+
+				if (a.interface < b.interface)
+					return -1;
+				else if (a.interface > b.interface)
+					return 1;
+
+				return 0;
+			});
+
 			return rv;
 		}, this));
 	},