From 9282df68942d104f56d7e440293783413f0a7cf9 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Sat, 15 Aug 2020 23:22:56 +0900 Subject: [PATCH] protocols: rename type to maptype for map "type" is already used as a common option for all protocols. This makes the configuration ambiguous, and Luci sees JS errors when trying to save a MAP configuration. Switch to "maptype" instead to avoid the conflict. MAP currently uses "maptype" and falls back to "type" when not specified. Signed-off-by: Remi NGUYEN VAN --- .../htdocs/luci-static/resources/protocol/map.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js index 006ebfbf08..913d68b9b8 100644 --- a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js +++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js @@ -40,7 +40,7 @@ return network.registerProtocol('map', { renderFormOptions: function(s) { var o; - o = s.taboption('general', form.ListValue, 'type', _('Type')); + o = s.taboption('general', form.ListValue, 'maptype', _('Type')); o.value('map-e', 'MAP-E'); o.value('map-t', 'MAP-T'); o.value('lw4o6', 'LW4over6'); -- 2.30.2