summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-mod-network/htdocs
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2021-06-17 08:58:15 +0200
committerJo-Philipp Wich <jo@mein.io>2021-06-17 09:22:16 +0200
commitf6f1eacb012b0364940c1dc9b9392fc0e60405b9 (patch)
tree44ce53a20b483562d1bcd491a9f8d49facc8daef /modules/luci-mod-network/htdocs
parent6e0af9320474d6c0635b629422278fac7eef1c68 (diff)
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 <jo@mein.io>
Diffstat (limited to 'modules/luci-mod-network/htdocs')
-rw-r--r--modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js3
1 files changed, 3 insertions, 0 deletions
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*]+)?$/);