diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-15 09:52:28 -0500 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-15 09:52:28 -0500 |
| commit | 3bcf3a5a98b5ea11de6160c8dfa524b5951784cd (patch) | |
| tree | 96e0b84c10f5646cfdec9ca7949199982c65caf9 /www/js/LoginCtrl.js | |
| parent | 0e88c443661a43ac5d28ae9f97faa5adc521e270 (diff) | |
#83 - quashed Event Server bugs
Former-commit-id: 6afcca617c6e5ae0662fad0ec469ce0aa8b325ee
Diffstat (limited to 'www/js/LoginCtrl.js')
| -rw-r--r-- | www/js/LoginCtrl.js | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index 7b1399b6..97b79658 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -60,8 +60,12 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r var zmServers = ZMDataModel.getServerGroups(); $scope.loginData = zmServers[serverbuttons[index].text]; $scope.check.isUseAuth = ($scope.loginData.isUseAuth == '1') ? true : false; - $scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == '1') ? true : false; + $scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == '1') ? true : false; + if (!$scope.check.isUseEventServer) + $rootScope.isAlarm = 0; + if ($scope.check.isUseEventServer) + EventServer.init(); return true; }, @@ -81,6 +85,14 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r $scope.loginData = zmServers[Object.keys(zmServers)[0]]; ZMDataModel.setLogin($scope.loginData); + availableServers = Object.keys(ZMDataModel.getServerGroups()); + serverbuttons = []; + for (var servIter=0; servIter<availableServers.length; servIter++) + { + serverbuttons.push({text: availableServers[servIter]}); + console.log ("ADDING : "+availableServers[servIter]); + } + } else { |