Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

protocols: rename "device" option to "_modem_device"

Browse source 
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>
(cherry picked from commit 96ee6dc8d6)
This commit is contained in:
Jo-Philipp Wich 2021-06-01 15:31:44 +02:00
parent 56cd1abbe8
commit 127b896a52
5 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js
View file

@ -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) {

3
protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js
View file

@ -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) {

3
protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js
View file

@ -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) {

3
protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js
View file

@ -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) {

3
protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js
View file

@ -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) {