openwrt-mirror/luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci.git synced 2025-12-21 19:14:34 +04:00
Code Issues Packages Projects Releases Wiki Activity

luci-app-usteer: Extra error checking

Browse Source 
Added extra error checking. When you directly load the usteer page "/cgi-bin/luci/admin/network/usteer"  then somehow the wifi networks do not get populated, this throws an error. Also fixed another console error related to the hostnames.

Signed-off-by: Ramon Van Gorkom <Ramon00c00@gmail.com>
This commit is contained in:
Ramon Van Gorkom
2025-06-22 16:20:56 +02:00
committed by Paul Donald
parent 9c0f071bbd
commit 59a1910b14
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
applications/luci-app-usteer/htdocs/luci-static/resources/view/usteer/usteer.js
View File

@@ -192,13 +192,14 @@ function collectRemoteHosts (remotehosttableentries,Remotehosts) {
dns_cache[address] = replies[address]; dns_cache[address] = replies[address];
continue; continue;
} else { } else {
dns_cache[address]=Hosts[ if (Hosts.length >0)
Object.keys(Hosts).find(mac => dns_cache[address]=Hosts[
((typeof Hosts[mac]['name'] !== 'undefined') && Object.keys(Hosts).find(mac =>
((Object.keys(Hosts[mac]['ip6addrs']).find(IPaddr2 => (address === Hosts[mac]['ip6addrs'][IPaddr2]))) || ((typeof Hosts[mac]['name'] !== 'undefined') &&
(Object.keys(Hosts[mac]['ipaddrs']).find(IPaddr2 => (address === Hosts[mac]['ipaddrs'][IPaddr2]))))) ((Object.keys(Hosts[mac]['ip6addrs']).find(IPaddr2 => (address === Hosts[mac]['ip6addrs'][IPaddr2]))) ||
) (Object.keys(Hosts[mac]['ipaddrs']).find(IPaddr2 => (address === Hosts[mac]['ipaddrs'][IPaddr2])))))
]['name']; )
]['name'];
} }
} }
}); });
@@ -328,7 +329,7 @@ return view.extend({
this.callGetRemoteinfo().catch (function (){return null;}), this.callGetRemoteinfo().catch (function (){return null;}),
this.callGetLocalinfo().catch (function (){return null;}), this.callGetLocalinfo().catch (function (){return null;}),
this.callGetClients().catch (function (){return null;}), this.callGetClients().catch (function (){return null;}),
network.getWifiNetworks() network.getWifiNetworks().catch (function (){return null;})
]); ]);
}, },
@@ -624,10 +625,11 @@ return view.extend({
o = s.taboption('settings', form.DynamicList, 'ssid_list', _('SSID list'), _('List of SSIDs to enable steering on')+' ('+_('empty means all')+')'); o = s.taboption('settings', form.DynamicList, 'ssid_list', _('SSID list'), _('List of SSIDs to enable steering on')+' ('+_('empty means all')+')');
WifiNetworks.forEach(function (wifiNetwork) { WifiNetworks.forEach(function (wifiNetwork) {
if (wifiNetwork.getSSID() && (!o.keylist || o.keylist.indexOf(wifiNetwork.getSSID()) === -1)) { if (wifiNetwork && typeof wifiNetwork === 'object')
o.value(wifiNetwork.getSSID()) if (wifiNetwork.getSSID() && (!o.keylist || o.keylist.indexOf(wifiNetwork.getSSID()) === -1)) {
} o.value(wifiNetwork.getSSID())
}); }
});
o.optional = true; o.optional = true;
o.datatype = 'list(string)'; o.datatype = 'list(string)';