diff options
| -rw-r--r-- | www/js/EventCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/NVR.js | 7 | ||||
| -rw-r--r-- | www/js/TimelineCtrl.js | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 2e1948e1..c1311ebd 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -1877,7 +1877,7 @@ angular.module('zmApp.controllers') var af = "/AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0); if (ld.objectDetectionFilter) { - af = af + '/Notes REGEXP:"detected:"'; + af = af + '/Notes REGEXP:detected:'; } diff --git a/www/js/NVR.js b/www/js/NVR.js index 53d7a350..1b5b9da8 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -458,7 +458,7 @@ angular.module('zmApp.controllers') return d.promise; } debug("API based login returned. "); - //console.log (JSON.stringify(succ)); + console.log (JSON.stringify(succ)); setCurrentServerVersion(succ.version); $ionicLoading.hide(); //$rootScope.loggedIntoZm = 1; @@ -503,6 +503,7 @@ angular.module('zmApp.controllers') loginData.loginAPISupported = true; setLogin(loginData); + log("Stream authentication construction: " + $rootScope.authSession); @@ -3138,7 +3139,7 @@ angular.module('zmApp.controllers') //https:///zm/api/events/index/Notes%20REGEXP:detected%3A.json if (loginData.objectDetectionFilter && !noObjectFilter) { - myurl = myurl + '/Notes%20REGEXP:detected%3A'; + myurl = myurl + '/Notes REGEXP:detected:'; } @@ -3228,7 +3229,7 @@ angular.module('zmApp.controllers') // don't know why but adding page messes up Notes //https:///zm/api/events/index/Notes%20REGEXP: detected%3A.json if (loginData.objectDetectionFilter && !noObjectFilter) { - myurl = myurl + '/Notes REGEXP:"detected:"'; + myurl = myurl + '/Notes REGEXP:detected:'; } myurl = myurl + ".json?&sort=StartTime&direction=desc&page=" + pageId + $rootScope.authSession; diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 193e04ac..d2cc82ea 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -1138,7 +1138,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla // I am waiting for the full data to load before I draw var promises = []; while ((pages <= epData.pageCount) && (iterCount > 0)) { - var promise = NVR.getEvents(0, pages, "none", fromDateNoLang, toDateNoLang, false); + var promise = NVR.getEvents(0, pages, "none", fromDateNoLang, toDateNoLang, true); promises.push(promise); pages++; |