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 a6d60360635cebc8eafdbd717b2a90801fa99fd0..71e5a6c8602fa8d3500b797d691dcd4bea21612e 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js
@@ -920,6 +920,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)';