modules/admin-full: make wifi enabling/disabling more reliable

[project/luci.git] / modules / admin-full / luasrc / view / admin_network / wifi_overview.htm

diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
index d528876..312fd08 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
@@ -36,6 +36,7 @@ You may obtain a copy of the License at
                                if bl.b then bands = bands .. "b" end
                                if bl.g then bands = bands .. "g" end
                                if bl.n then bands = bands .. "n" end
+                               if bl.ac then bands = bands .. "ac" end
                        end
 
                        local hw = dev.iwinfo.hardware_name
@@ -187,7 +188,7 @@ You may obtain a copy of the License at
                                for( var i = 0; i < st.length; i++ )
                                {
                                        var iw = st[i];
-                                       var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel);
+                                       var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel && iw.mode != 'Unknown');
                                        var p = iw.quality;
                                        var q = is_assoc ? p : -1;
 
@@ -218,7 +219,7 @@ You may obtain a copy of the License at
                                        var toggle = document.getElementById(iw.id + '-iw-toggle');
                                        if (toggle)
                                        {
-                                               if (is_assoc)
+                                               if (!iw.disabled)
                                                {
                                                        toggle.className = 'cbi-button cbi-button-reset';
                                                        toggle.value = '<%:Disable%>';
@@ -231,7 +232,7 @@ You may obtain a copy of the License at
                                                        toggle.title = '<%:Activate this network%>';
                                                }
 
-                                               toggle.setAttribute('active', is_assoc);
+                                               toggle.setAttribute('active', !iw.disabled);
                                        }
 
                                        var info = document.getElementById(iw.id + '-iw-status');