diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2022-04-27 13:18:29 +0300 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2022-04-27 13:19:13 +0300 |
| commit | f04011f0683dbacb8b831733c708bad760ca61df (patch) | |
| tree | 0951749fccd331b4dea7bcad876be26c1f1b71e3 | |
| parent | f2f7e0c1f71199f945e4f936bb1396e0c1f30b33 (diff) | |
luci-mod-network: avoid needlessly writing `none` RA flags
Fixes: #5725
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
| -rw-r--r-- | modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js index f8c7c6a7ff..5b99ae17cd 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js @@ -805,7 +805,14 @@ return view.extend({ return flags.length ? flags : [ 'other-config' ]; }; so.remove = function(section_id) { - uci.set('dhcp', section_id, 'ra_flags', [ 'none' ]); + var existing = L.toArray(uci.get('dhcp', section_id, 'ra_flags')); + if (this.isActive(section_id)) { + if (existing.length != 1 || existing[0] != 'none') + uci.set('dhcp', section_id, 'ra_flags', [ 'none' ]); + } + else if (existing.length) { + uci.unset('dhcp', section_id, 'ra_flags'); + } }; so = ss.taboption('ipv6-ra', form.Value, 'ra_maxinterval', _('Max <abbr title="Router Advertisement">RA</abbr> interval'), _('Maximum time allowed between sending unsolicited <abbr title="Router Advertisement, ICMPv6 Type 134">RA</abbr>. Default is 600 seconds.')); |