diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/NVR.js | 4 | ||||
| -rw-r--r-- | www/js/TimelineCtrl.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/www/js/NVR.js b/www/js/NVR.js index 3cfdb1dd..9178669a 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -2635,7 +2635,7 @@ angular.module('zmApp.controllers') // All this effort because the ZM APIs return events in sorted order, oldest first. Yeesh. //----------------------------------------------------------------------------- - getEventsPages: function (monitorId, startTime, endTime) { + getEventsPages: function (monitorId, startTime, endTime, noObjectFilter) { //console.log("********** INSIDE EVENTS PAGES "); var d = $q.defer(); @@ -2655,7 +2655,7 @@ angular.module('zmApp.controllers') myurl = myurl + "/AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); //https:///zm/api/events/index/Notes%20REGEXP:detected%3A.json - if (loginData.objectDetectionFilter) { + if (loginData.objectDetectionFilter && !noObjectFilter) { myurl = myurl + '/Notes%20REGEXP:detected%3A'; } diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 43f51ba4..1fc43743 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -1107,7 +1107,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla //console.log ("**NOLANG" + fromDateNoLang + " " + toDateNoLang); - NVR.getEventsPages(0, fromDateNoLang, toDateNoLang) + NVR.getEventsPages(0, fromDateNoLang, toDateNoLang, true) .then(function (epData) { var pages = 1; var itemsPerPage = parseInt(epData.limit); |