From da2e8fb3e2bfff0494cd5f496a7e458b3f033114 Mon Sep 17 00:00:00 2001 From: Miguel Angel Mulero Martinez Date: Mon, 5 Feb 2024 19:35:00 +0100 Subject: [PATCH] luci-app-usteer: retrieve SSIDs to be used in the config This commit retrieves the list of SSIDs availables to prepopulate the ssid_list UI element of the config. Signed-off-by: Miguel Angel Mulero Martinez (cherry picked from commit 5b6a70575469affbff94229353a7f7e1c58a7a1b) --- .../luci-static/resources/view/usteer/usteer.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/applications/luci-app-usteer/htdocs/luci-static/resources/view/usteer/usteer.js b/applications/luci-app-usteer/htdocs/luci-static/resources/view/usteer/usteer.js index 6fedd2f41a..ce245a4dc7 100644 --- a/applications/luci-app-usteer/htdocs/luci-static/resources/view/usteer/usteer.js +++ b/applications/luci-app-usteer/htdocs/luci-static/resources/view/usteer/usteer.js @@ -6,9 +6,10 @@ 'require ui'; 'require form'; 'require uci'; +'require network'; 'require tools.widgets as widgets'; -var Hosts, Remotehosts, Remoteinfo, Localinfo, Clients; +var Hosts, Remotehosts, Remoteinfo, Localinfo, Clients, WifiNetworks; var dns_cache = []; @@ -326,7 +327,8 @@ return view.extend({ this.callGetRemotehosts().catch (function (){return null;}), this.callGetRemoteinfo().catch (function (){return null;}), this.callGetLocalinfo().catch (function (){return null;}), - this.callGetClients().catch (function (){return null;}) + this.callGetClients().catch (function (){return null;}), + network.getWifiNetworks() ]); }, @@ -379,6 +381,7 @@ return view.extend({ Remoteinfo = data[3]; Localinfo = data[4]; Clients = data[5]; + WifiNetworks = data[6]; s = m.section(form.TypedSection); s.anonymous = true; @@ -606,7 +609,12 @@ return view.extend({ o.optional = true; o.datatype = 'list(string)'; - o = s.taboption('settings', form.DynamicList, 'ssid_list', _('SSID list'), _('List of SSIDs to enable steering on')); + o = s.taboption('settings', form.MultiValue, 'ssid_list', _('SSID list'), _('List of SSIDs to enable steering on')); + WifiNetworks.forEach(function (wifiNetwork) { + if (wifiNetwork.getSSID()) { + o.value(wifiNetwork.getSSID()) + } + }); o.optional = true; o.datatype = 'list(string)'; -- 2.30.2