#704 chaining fixes

ZoneMinder · Sep 13, 2018 · b8c72c8 · b8c72c8
1 parent 710c9a2
commit b8c72c8
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 14 deletions.
diff --git a/jsconfig.json b/jsconfig.json
@@ -3,8 +3,8 @@
         "www/**/*"
     ],
     "exclude": [
-        "node_modules/",
-        "dist/",
-        "platforms/"
+        "node_modules",
+        "dist",
+        "platforms"
     ]
 }
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
@@ -1707,15 +1707,17 @@ angular.module('zmApp.controllers')
         // returns API version or none 
         //-------------------------------------------------------
         getAPIversion: function () {
-          debug("getAPIversion called");
+
           var d = $q.defer();
           var apiurl = loginData.apiurl + '/host/getVersion.json';
+          debug("getAPIversion called with "+apiurl);
           $http.get(apiurl)
             .then(function (success) {
                 if (success.data.version) {
                   // console.log ("API VERSION RETURNED: " + JSON.stringify(success));
                   $rootScope.apiValid = true;
                   setCurrentServerVersion(success.data.version);
+                  debug("getAPI version succeded with "+success.data.version);
                   d.resolve(success.data.version);
                 } else {
                   debug("Setting APIValid to false as API version was not retrieved");

diff --git a/www/js/MenuController.js b/www/js/MenuController.js
@@ -135,6 +135,7 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
                               disableBack: true
                             });
 
+                            console.log ("+++ state go after getMonitors force");
                             $state.go('app.refresh', {
                               "view": $state.current.name
                             });
@@ -145,14 +146,15 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
                         },
                         function (error) {
                           var refresh = NVRDataModel.getMonitors(1);
-
+                          console.log ("+++ state go after API version error: "+error);
                           $rootScope.apiVersion = "0.0.0";
                           NVRDataModel.debug("Error, failed API version, setting to " + $rootScope.apiVersion);
 
                           $ionicHistory.nextViewOptions({
                             disableBack: true
                           });
 
+
                           $state.go('app.refresh', {
                             "view": $state.current.name
                           });
@@ -174,15 +176,20 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
                     NVRDataModel.debug("refreshing API version...");
                     NVRDataModel.getAPIversion()
                       .then(function (data) {
-                          var refresh = NVRDataModel.getMonitors(1);
-                          $rootScope.apiVersion = data;
+                          var refresh = NVRDataModel.getMonitors(1)
+                          .then (function () {
+                            $rootScope.apiVersion = data;
                           $ionicHistory.nextViewOptions({
                             disableBack: true
                           });
+
+                          console.log ("+++ state go after 5xx");
                           $state.go('app.refresh', {
                             "view": $state.current.name
                           });
                           return;
+                          });
+
                         },
                         function (error) {
                           var refresh = NVRDataModel.getMonitors(1);
@@ -191,6 +198,7 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
                           $ionicHistory.nextViewOptions({
                             disableBack: true
                           });
+                          console.log ("+++ state go after API version force");
                           $state.go('app.refresh', {
                             "view": $state.current.name
                           });
@@ -234,7 +242,7 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
       scope: $scope,
       template: '<ion-radio-fix ng-if="item" ng-repeat="item in avs" ng-value="item" ng-model="newServer.val"> {{item}} </ion-radio-fix>',
 
-      title: $translate.instant('kSelectLanguage'),
+      title: $translate.instant('kSelect'),
 
       buttons: [{
           text: $translate.instant('kButtonCancel'),

diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
@@ -1804,6 +1804,9 @@ angular.module('zmApp.controllers')
       currentStreamState = streamState.SNAPSHOT;
       // NVRDataModel.regenConnKeys();
       $scope.monitors = NVRDataModel.getMonitorsNow();
+
+      console.log ("MONITORS:"+JSON.stringify($scope.monitors));
+
       $scope.MontageMonitors = angular.copy($scope.monitors);
 
 

diff --git a/www/js/app.js b/www/js/app.js
@@ -1751,15 +1751,22 @@ angular.module('zmApp', [
 
 
 
-        if ((NVRDataModel.hasLoginInfo() || toState.data.requireLogin == false) && toState.name != "app.invalidapi" && toState.name != "app.refresh")  {
+        if ((NVRDataModel.hasLoginInfo() || toState.data.requireLogin == false) && toState.name != "app.invalidapi" )  {
           //console.log("State transition is authorized");
-          NVRDataModel.debug ("Setting last-desktop-state to:"+JSON.stringify(toState));
-          localforage.setItem('last-desktop-state', {
-            'name': toState.name,
-            'params': toState.params
-          });
+
+          if (toState.name != "app.refresh") {
+
+            NVRDataModel.debug ("Setting last-desktop-state to:"+JSON.stringify(toState));
+            localforage.setItem('last-desktop-state', {
+              'name': toState.name,
+              'params': toState.params
+            });
+
+
+          }
           $rootScope.dpadState = toState.name.replace("app.", "");
           return;
+
         } else {
           NVRDataModel.log("In Auth State trans: Not logged in, requested to go to " + JSON.stringify(toState));
           // event.preventDefault();