summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRemi NGUYEN VAN <remi.nguyenvan+openwrt@gmail.com>2020-08-15 23:22:56 +0900
committerRemi NGUYEN VAN <remi.nguyenvan+openwrt@gmail.com>2020-08-15 23:22:56 +0900
commit9282df68942d104f56d7e440293783413f0a7cf9 (patch)
tree9138fe5d4cfcded239a2e4097c9192df7085cbbb
parentf2e9031b871c7c00695d66441595719385a0b144 (diff)
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 <remi.nguyenvan+openwrt@gmail.com>
-rw-r--r--protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js2
1 files changed, 1 insertions, 1 deletions
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');