diff --git a/luciexpress/htdocs/plugins/core/pages/overview.js b/luciexpress/htdocs/plugins/core/pages/overview.js index ae4cb0048..c993562f8 100644 --- a/luciexpress/htdocs/plugins/core/pages/overview.js +++ b/luciexpress/htdocs/plugins/core/pages/overview.js @@ -27,10 +27,10 @@ $juci.module("core") $scope.wifi = $uci.wireless; $scope.boardpanel = $uci.boardpanel; $scope.voice_client = $uci.voice_client; - if($uci.wireless && $uci.wireless.status) + if($uci.wireless && $uci.wireless.status) { $scope.wifiSchedStatus = (($uci.wireless.status.schedule.value)?gettext("on"):gettext("off")); - if($uci.wireless && $uci.wireless.wps) - $scope.wifiWPSStatus = (($scope.boardpanel.settings.wpsbutton.value)?gettext("on"):gettext("off")); + $scope.wifiWPSStatus = (($uci.wireless.status.wps.value)?gettext("on"):gettext("off")); + } if($uci.voice_client && $uci.voice_client["@sip_service_provider"]){ $scope.sipAccounts = $uci.voice_client["@sip_service_provider"]; } diff --git a/luciexpress/htdocs/plugins/wifi/tests/test-wireless.js b/luciexpress/htdocs/plugins/wifi/tests/test-wireless.js index 159f9402d..e5604211f 100644 --- a/luciexpress/htdocs/plugins/wifi/tests/test-wireless.js +++ b/luciexpress/htdocs/plugins/wifi/tests/test-wireless.js @@ -20,6 +20,9 @@ describe("Wireless", function(){ done(); }); }); + it("should have hosts config", function(){ + expect($uci.hosts).to.be.ok(); + }); it("should have at least one wireless device and interface defined", function(done){ expect($uci.wireless["@wifi-device"]).to.be.an(Array); expect($uci.wireless["@wifi-iface"]).to.be.an(Array); diff --git a/luciexpress/htdocs/plugins/wifi/wifi.js b/luciexpress/htdocs/plugins/wifi/wifi.js index 3d73b1f90..3ecf948a4 100644 --- a/luciexpress/htdocs/plugins/wifi/wifi.js +++ b/luciexpress/htdocs/plugins/wifi/wifi.js @@ -55,6 +55,7 @@ JUCI.app "encryption": { dvalue: "mixed-psk", type: String, allow: [ "none", "wep", "psk", "psk2", "mixed-psk" ] }, "cipher": { dvalue: "auto", type: String, allow: [ "auto" ] }, "key": { dvalue: "", type: String }, + "ifname": { dvalue: "", type: String }, "gtk_rekey": { dvalue: false, type: Boolean }, "wps_pbc": { dvalue: false, type: Boolean }, "wmf_bss_enable":{ dvalue: false, type: Boolean },