diff options
| author | Pliable Pixels <pliablepixels@users.noreply.github.com> | 2019-08-20 14:26:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-20 14:26:41 -0400 |
| commit | bd93725082aee41a342cd27f6df73dbf289a9608 (patch) | |
| tree | 66251ee4b16970d5bc991c55263d65eb49ab1ef6 /www/js/PortalLoginCtrl.js | |
| parent | b36c596f4350ba7e8772044c6601ca5404de1dde (diff) | |
| parent | f11b5e9416d808ce92480c164dce389e233609df (diff) | |
Merge pull request #843 from pliablepixels/what-a-login-mess
What a login mess
Diffstat (limited to 'www/js/PortalLoginCtrl.js')
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index 17715238..192c0c4e 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -470,12 +470,19 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic }, function error(e) { + $ionicHistory.nextViewOptions({ + disableAnimate:true, + disableBack: true + }); + if ($rootScope.apiValid == true) { $state.go("app.login", { "wizard": false }); return; } else { + NVR.log ('Portal login:invalid api'); + if (!$rootScope.userCancelledAuth) $state.go("app.invalidapi"); return; } |