From: Jo-Philipp Wich <redacted>
Date: Thu, 17 Jun 2021 06:58:15 +0000 (+0200)
Subject: luci-mod-network: only consider bridge vlans belonging to the current device
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=f6f1eacb012b0364940c1dc9b9392fc0e60405b9;p=openwrt-luci.git

luci-mod-network: only consider bridge vlans belonging to the current device

In case multiple bridges with bridge vlans are declared, LuCI did not
correctly filter the VLANs to show only the ones belonging to the
bridge being configured currently.

Signed-off-by: Jo-Philipp Wich <redacted>
---

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js b/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js
index 2ebf3afe02..ce6388b6cd 100644
--- a/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js
@@ -968,6 +968,9 @@ return baseclass.extend({
 		});
 
 		uci.sections('network', 'bridge-vlan', function(bvs) {
+			if (uci.get('network', s.section, 'name') != bvs.device)
+				return;
+
 			L.toArray(bvs.ports).forEach(function(portspec) {
 				var m = portspec.match(/^([^:]+)(?::[ut*]+)?$/);