mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed up overview page to use new wireless.status uci section

Browse source
This commit is contained in:
Martin Schröder 2015-05-18 17:12:59 +02:00 • committed by Martin Schröder
parent 47a9135dd6
commit 7ec6685fce
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
luciexpress/htdocs/plugins/core/pages/overview.js
View file

@ -27,10 +27,10 @@ $juci.module("core")
$scope.wifi = $uci.wireless; $scope.wifi = $uci.wireless;
$scope.boardpanel = $uci.boardpanel; $scope.boardpanel = $uci.boardpanel;
$scope.voice_client = $uci.voice_client; $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")); $scope.wifiSchedStatus = (($uci.wireless.status.schedule.value)?gettext("on"):gettext("off"));
if($uci.wireless && $uci.wireless.wps) $scope.wifiWPSStatus = (($uci.wireless.status.wps.value)?gettext("on"):gettext("off"));
$scope.wifiWPSStatus = (($scope.boardpanel.settings.wpsbutton.value)?gettext("on"):gettext("off")); }
if($uci.voice_client && $uci.voice_client["@sip_service_provider"]){ if($uci.voice_client && $uci.voice_client["@sip_service_provider"]){
$scope.sipAccounts = $uci.voice_client["@sip_service_provider"]; $scope.sipAccounts = $uci.voice_client["@sip_service_provider"];
} }

3
luciexpress/htdocs/plugins/wifi/tests/test-wireless.js
View file

@ -20,6 +20,9 @@ describe("Wireless", function(){
done(); 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){ 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-device"]).to.be.an(Array);
expect($uci.wireless["@wifi-iface"]).to.be.an(Array); expect($uci.wireless["@wifi-iface"]).to.be.an(Array);

1
luciexpress/htdocs/plugins/wifi/wifi.js
View file

@ -55,6 +55,7 @@ JUCI.app
"encryption": { dvalue: "mixed-psk", type: String, allow: [ "none", "wep", "psk", "psk2", "mixed-psk" ] }, "encryption": { dvalue: "mixed-psk", type: String, allow: [ "none", "wep", "psk", "psk2", "mixed-psk" ] },
"cipher": { dvalue: "auto", type: String, allow: [ "auto" ] }, "cipher": { dvalue: "auto", type: String, allow: [ "auto" ] },
"key": { dvalue: "", type: String }, "key": { dvalue: "", type: String },
"ifname": { dvalue: "", type: String },
"gtk_rekey": { dvalue: false, type: Boolean }, "gtk_rekey": { dvalue: false, type: Boolean },
"wps_pbc": { dvalue: false, type: Boolean }, "wps_pbc": { dvalue: false, type: Boolean },
"wmf_bss_enable":{ dvalue: false, type: Boolean }, "wmf_bss_enable":{ dvalue: false, type: Boolean },