diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-05-05 11:45:19 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-05-05 11:45:19 -0400 |
| commit | e337593cc65dac19eeb29fc99b7def02fdbc55ed (patch) | |
| tree | b0d1e5797e478063dfce50ccb81148406d5ccee1 /www/js/LoginCtrl.js | |
| parent | 65869bd131cc2f05a09a0a0ca360f4c514828116 (diff) | |
#241 - lots of fixes, now switching between fid=XXX and path=YYYY mode depending on API version and other muti-server fixes
Former-commit-id: 57ace2fa05175a07a5565c24820f5f56c6cfd2e0
Diffstat (limited to 'www/js/LoginCtrl.js')
| -rw-r--r-- | www/js/LoginCtrl.js | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index 6f09040f..4d569658 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -677,7 +677,17 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r ZMDataModel.zmDebug("Urk! cgi-path returned success, but it should not have come here"); loginStatus = "Login validated, but could not validate cgi-path. If live streams don't work please check your cgi-bin path or try using the discover feature"; - var refresh = ZMDataModel.getMonitors(1); + ZMDataModel.zmDebug ("refreshing API version..."); + ZMDataModel.getAPIversion() + .then (function (data) { + var refresh = ZMDataModel.getMonitors(1); + $rootScope.apiVersion = data; + }, + function (error) { + var refresh = ZMDataModel.getMonitors(1); + $rootScope.apiVersion = "0.0.0"; + ZMDataModel.zmDebug ("Error, failed API version, setting to " +$rootScope.apiVersion); + }); if (showalert) { @@ -712,7 +722,17 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r }); } - var refresh = ZMDataModel.getMonitors(1); + ZMDataModel.zmDebug ("refreshing API version..."); + ZMDataModel.getAPIversion() + .then (function (data) { + var refresh = ZMDataModel.getMonitors(1); + $rootScope.apiVersion = data; + }, + function (error) { + var refresh = ZMDataModel.getMonitors(1); + $rootScope.apiVersion = "0.0.0"; + ZMDataModel.zmDebug ("Error, failed API version, setting to " +$rootScope.apiVersion); + }); }); }); |