protocols: rename "device" option to "_modem_device"

This is required to resolve clashes with the generic "option device"
referring to netdev names in current netifd versions.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js b/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js
index 7dab110207733cd9b5cbf0bbe8a445f50d3642cb..620b4032df83e3ccaa46aaa59a8dcfc2f14d5f94 100644 (file)
--- a/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js
+++ b/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js
@@ -70,7 +70,8 @@ return network.registerProtocol('3g', {
        renderFormOptions: function(s) {
                var o;
 
-               o = s.taboption('general', form.Value, 'device', _('Modem device'));
+               o = s.taboption('general', form.Value, '_modem_device', _('Modem device'));
+               o.ucioption = 'device';
                o.rmempty = false;
                o.load = function(section_id) {
                        return callFileList('/dev/').then(L.bind(function(devices) {

diff --git a/protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js b/protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js
index 1851cbe1caa349058cad6b90444b35f77b7f8386..3825b8ef166ed7c1e2fba86f8738d0e3fb71b1c8 100644 (file)
--- a/protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js
+++ b/protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js
@@ -79,7 +79,8 @@ return network.registerProtocol('modemmanager', {
        renderFormOptions: function(s) {
                var dev = this.getL3Device() || this.getDevice(), o;
 
-               o = s.taboption('general', form.ListValue, 'device', _('Modem device'));
+               o = s.taboption('general', form.ListValue, '_modem_device', _('Modem device'));
+               o.ucioption = 'device';
                o.rmempty = false;
                o.load = function(section_id) {
                        return getModemList().then(L.bind(function(devices) {

diff --git a/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js b/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js
index 3195592d97ac86f31905e093b640f8c691b4176f..13dee21b15b301cb937f51e47269768864fd0b88 100644 (file)
--- a/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js
+++ b/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js
@@ -58,7 +58,8 @@ return network.registerProtocol('ncm', {
        renderFormOptions: function(s) {
                var o;
 
-               o = s.taboption('general', form.Value, 'device', _('Modem device'));
+               o = s.taboption('general', form.Value, '_modem_device', _('Modem device'));
+               o.ucioption = 'device';
                o.rmempty = false;
                o.load = function(section_id) {
                        return callFileList('/dev/').then(L.bind(function(devices) {

diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js
index 6df468f9e34a815981c16f8d4d5c0ba41b9ecccd..49ac8c4f894293b3d9c07bd165aed5d93f87e895 100644 (file)
--- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js
+++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js
@@ -70,7 +70,8 @@ return network.registerProtocol('ppp', {
        renderFormOptions: function(s) {
                var dev = this.getL3Device() || this.getDevice(), o;
 
-               o = s.taboption('general', form.Value, 'device', _('Modem device'));
+               o = s.taboption('general', form.Value, '_modem_device', _('Modem device'));
+               o.ucioption = 'device';
                o.rmempty = false;
                o.load = function(section_id) {
                        return callFileList('/dev/').then(L.bind(function(devices) {

diff --git a/protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js b/protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js
index de5bf493515995c9372640cdaac54fe9261f2c6e..7c9e72cb1ac56712b3b788972cf3ad854a09d18c 100644 (file)
--- a/protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js
+++ b/protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js
@@ -54,7 +54,8 @@ return network.registerProtocol('qmi', {
        renderFormOptions: function(s) {
                var dev = this.getL3Device() || this.getDevice(), o;
 
-               o = s.taboption('general', form.Value, 'device', _('Modem device'));
+               o = s.taboption('general', form.Value, '_modem_device', _('Modem device'));
+               o.ucioption = 'device';
                o.rmempty = false;
                o.load = function(section_id) {
                        return callFileList('/dev/').then(L.bind(function(devices) {