diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-08-27 17:56:39 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-08-27 17:56:39 -0400 |
| commit | 210a8c986e32d963d97c76be892bd205df731ae0 (patch) | |
| tree | 925797c1e9fcbffd14c3d8cd6e66a56325a70871 | |
| parent | a4033264aa4ec0827305ba36593bd337a401a320 (diff) | |
minor tweaks
Former-commit-id: 1de87422a79f63d8ddbbed4ac4705b11ae382dae
| -rw-r--r-- | config.xml | 2 | ||||
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 33 | ||||
| -rw-r--r-- | www/js/app.js | 3 |
3 files changed, 28 insertions, 10 deletions
@@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.15" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.16" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>zmNinja</name> <description> High performance ZoneMinder client diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index a47cc91e..f579ab8c 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -142,7 +142,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic { ZMDataModel.zmDebug("PortalLogin: auth success"); ZMDataModel.getKeyConfigParams(1); - + // $state.go("login" ,{"wizard": false}); //login was ok, so get API details ZMDataModel.getAPIversion() .then (function(data) { @@ -160,8 +160,31 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic $state.go('importantmessage', {"ver":data}); } - }); - EventServer.refresh(); + + if (data == "0.0.0") + { + + ZMDataModel.zmLog ("API getVersion succeeded but returned 0.0.0 " + JSON.stringify(data)); + ZMDataModel.displayBanner('error', ['ZoneMinder authentication failed']); + $state.go("login" ,{"wizard": false}); + + } + // coming here means continue + EventServer.refresh(); + var statetoGo = $rootScope.lastState ? $rootScope.lastState : 'montage'; + ZMDataModel.zmDebug ("logging state transition"); + ZMDataModel.zmDebug("Transitioning state to: " + + statetoGo + " with param " +JSON.stringify($rootScope.lastStateParam) ); + $state.go(statetoGo, $rootScope.lastStateParam); + + }, + function (error) { // API Error + ZMDataModel.zmLog ("API Error handler: going to login getAPI returned error: " + JSON.stringify(error)); + ZMDataModel.displayBanner('error', ['ZoneMinder authentication failed']); + $state.go("login" ,{"wizard": false}); + + }); + if ($rootScope.tappedNotification) { @@ -193,9 +216,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic return; } } - ZMDataModel.zmDebug("Transitioning state to: " + - $rootScope.lastState ? $rootScope.lastState : 'montage'); - $state.go($rootScope.lastState ? $rootScope.lastState : 'montage', $rootScope.lastStateParam); + }, // coming here means auth error diff --git a/www/js/app.js b/www/js/app.js index 27a76a05..c036115a 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -829,9 +829,6 @@ angular.module('zmApp', [ $rootScope.loggedIntoZm = 1; ZMDataModel.zmLog("zmAutologin successfully logged into Zoneminder"); - - ZMDataModel.zmDebug (">>>>> I GOT THIS LOGIN DATA - ARE WE REALLY LOGGED IN ?"); - ZMDataModel.zmDebug (">>>>>"+ JSON.stringify(data)); d.resolve("Login Success"); |