projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
luci-mod-admin-full: status: survive broken DSL status output
[project/luci.git]
/
modules
/
luci-mod-admin-full
/
luasrc
/
view
/
admin_status
/
index.htm
diff --git
a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
index
548b22d
..
a98d790
100644
(file)
--- a/
modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
+++ b/
modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
@@
-88,7
+88,9
@@
if has_dsl then
local dsl_stat = luci.sys.exec("/etc/init.d/dsl_control lucistat")
local dsl_func = loadstring(dsl_stat)
if has_dsl then
local dsl_stat = luci.sys.exec("/etc/init.d/dsl_control lucistat")
local dsl_func = loadstring(dsl_stat)
- rv.dsl = dsl_func()
+ if dsl_func then
+ rv.dsl = dsl_func()
+ end
end
luci.http.prepare_content("application/json")
end
luci.http.prepare_content("application/json")
@@
-352,7
+354,7
@@
for (var nidx = 0; nidx < dev.networks.length; nidx++)
{
var net = dev.networks[nidx];
for (var nidx = 0; nidx < dev.networks.length; nidx++)
{
var net = dev.networks[nidx];
- var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel);
+ var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel
&& !net.disabled
);
var icon;
if (!is_assoc)
var icon;
if (!is_assoc)