From: Jo-Philipp Wich <jo@mein.io>
Date: Fri, 15 Mar 2024 12:23:04 +0000 (+0100)
Subject: luci-mod-network: don't trigger uci save on removing bridge vlans
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=ac63beabb49ace9c5f1b98d6d8b4330ba5d361aa;p=project%2Fluci.git

luci-mod-network: don't trigger uci save on removing bridge vlans

Do not trigger a uci save operation on removing bridge VLANs as that might
invalidate the ephemeral section ID of a just added network device.

Fixes: #6990
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 61cef9baad6cf753d37bfa7fb7a661d26180f6b9)
---

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 f823d69604..40ab9637b4 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
@@ -919,6 +919,15 @@ return baseclass.extend({
 			}, this));
 		};
 
+		ss.handleRemove = function(section_id) {
+			this.map.data.remove('network', section_id);
+			s.map.addedVLANs = s.map.addedVLANs.filter(function(sid) {
+				return sid != section_id;
+			});
+
+			return this.redraw();
+		};
+
 		o = ss.option(form.Value, 'vlan', _('VLAN ID'));
 		o.datatype = 'range(1, 4094)';