summaryrefslogtreecommitdiff
path: root/www/js/LoginCtrl.js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js/LoginCtrl.js')
-rw-r--r--www/js/LoginCtrl.js14
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
{