diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-10-13 14:38:22 -0400 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-10-13 14:38:22 -0400 |
| commit | 461244f3b92c491f16125279b6f5e0c03a527430 (patch) | |
| tree | 1d4612e2be3240b669f8b6fa1e954146372880d7 | |
| parent | fc031b54de1d60de0a0e94dd8e807f0e649a3780 (diff) | |
dev hack in portal login
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index b38cf0fc..81f36b14 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -80,7 +80,9 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic ZMDataModel.getAPIversion() .then (function(data) { ZMDataModel.zmLog("Got API version: " + data); - if (versionCompare(data,zm.minAppVersion)) + var ld = ZMDataModel.getLogin(); + if (versionCompare(data,zm.minAppVersion) && (ld.url.indexOf("arjunrc.") == -1) && data !="0.0.0") + //if (versionCompare(data,zm.minAppVersion)) { $state.go('lowversion', {"ver":data}); @@ -170,14 +172,17 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic ZMDataModel.zmLog("Got API version: " + data); if (versionCompare(data,zm.minAppVersion) && (ld.url.indexOf("arjunrc.") == -1) && data !="0.0.0") { - + + $state.go('lowversion', {"ver":data}); } }); ZMDataModel.getKeyConfigParams(1); + if ($rootScope.lastState == 'lowversion') $rootScope.lastState = 'montage'; ZMDataModel.zmDebug("Transitioning state to: " + $rootScope.lastState ? $rootScope.lastState : 'montage'); + console.log ("*********** GOING TO " + $rootScope.lastState); $state.go($rootScope.lastState ? $rootScope.lastState : 'montage', $rootScope.lastStateParam); }, // coming here means auth error |