summaryrefslogtreecommitdiff
path: root/www/js/NVR.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2019-02-02 11:30:03 -0500
committerPliable Pixels <pliablepixels@gmail.com>2019-02-02 11:30:03 -0500
commit9512d4e1a09ab70a57367ad3dc57b396619bbba1 (patch)
tree9b265ad7c993d3dbc3c794883becf3463b358468 /www/js/NVR.js
parentc91c3d989b85a14809c05cf66517f926dae52788 (diff)
remove object filter from eventsPages too
Diffstat (limited to 'www/js/NVR.js')
-rw-r--r--www/js/NVR.js4
1 files changed, 2 insertions, 2 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';
}