diff options
| author | Paul Donald <newtwen@gmail.com> | 2023-12-18 00:44:00 +0100 |
|---|---|---|
| committer | Paul Donald <newtwen@gmail.com> | 2023-12-18 00:44:00 +0100 |
| commit | 817a5e6fa28c35e81ee76d5d501901fb21e40341 (patch) | |
| tree | 721ba028b8d8e1ffb4da776f49887a765104c6ba | |
| parent | a962261b0b375378e379e31fcab4df5fca7a150e (diff) | |
Merge pull request #6755 from EvanTheB/modemaster
Signed-off-by: Evan Benn <evan.benn@morsemicro.com>
luci-base: Display 'Access Point' in the wireless page instead of 'Master'
(cherry picked from commit c3fc80c92a2ed30214ed039c6189e2c06023117a)
| -rw-r--r-- | modules/luci-base/htdocs/luci-static/resources/network.js | 25 | ||||
| -rw-r--r-- | modules/luci-compat/luasrc/model/network.lua | 2 |
2 files changed, 16 insertions, 11 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js index 2568017c26..4f08fd78bb 100644 --- a/modules/luci-base/htdocs/luci-static/resources/network.js +++ b/modules/luci-base/htdocs/luci-static/resources/network.js @@ -3823,8 +3823,8 @@ WifiNetwork = baseclass.extend(/** @lends LuCI.network.WifiNetwork.prototype */ * Query the current operation mode from runtime information. * * @returns {string} - * Returns the human readable mode name as reported by `ubus` runtime - * state. Possible returned values are: + * Returns the human readable mode name as reported by iwinfo or uci mode. + * Possible returned values are: * - `Master` * - `Ad-Hoc` * - `Client` @@ -3837,13 +3837,13 @@ WifiNetwork = baseclass.extend(/** @lends LuCI.network.WifiNetwork.prototype */ * - `Unknown` */ getActiveMode: function() { - var mode = this.ubus('net', 'iwinfo', 'mode') || this.ubus('net', 'config', 'mode') || this.get('mode') || 'ap'; + var mode = this.ubus('net', 'iwinfo', 'mode') || this.getMode(); switch (mode) { case 'ap': return 'Master'; case 'sta': return 'Client'; case 'adhoc': return 'Ad-Hoc'; - case 'mesh': return 'Mesh'; + case 'mesh': return 'Mesh Point'; case 'monitor': return 'Monitor'; default: return mode; } @@ -3861,12 +3861,17 @@ WifiNetwork = baseclass.extend(/** @lends LuCI.network.WifiNetwork.prototype */ var mode = this.getActiveMode(); switch (mode) { - case 'Master': return _('Master'); - case 'Client': return _('Client'); - case 'Ad-Hoc': return _('Ad-Hoc'); - case 'Mash': return _('Mesh'); - case 'Monitor': return _('Monitor'); - default: return mode; + case 'Master': return _('Access Point'); + case 'Ad-Hoc': return _('Ad-Hoc'); + case 'Client': return _('Client'); + case 'Monitor': return _('Monitor'); + case 'Master(VLAN)': return _('Master (VLAN)'); + case 'WDS': return _('WDS'); + case 'Mesh Point': return _('Mesh Point'); + case 'P2P Client': return _('P2P Client'); + case 'P2P Go': return _('P2P Go'); + case 'Unknown': return _('Unknown'); + default: return mode; } }, diff --git a/modules/luci-compat/luasrc/model/network.lua b/modules/luci-compat/luasrc/model/network.lua index b9ef19b171..1c25f899da 100644 --- a/modules/luci-compat/luasrc/model/network.lua +++ b/modules/luci-compat/luasrc/model/network.lua @@ -1761,7 +1761,7 @@ function wifinet.active_mode(self) if m == "ap" then m = "Master" elseif m == "sta" then m = "Client" elseif m == "adhoc" then m = "Ad-Hoc" - elseif m == "mesh" then m = "Mesh" + elseif m == "mesh" then m = "Mesh Point" elseif m == "monitor" then m = "Monitor" end |