summaryrefslogtreecommitdiff
path: root/www/js/DataModel.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-12-02 15:14:04 -0500
committerPliable Pixels <pliablepixels@gmail.com>2018-12-02 15:14:04 -0500
commit3b5e6ca99ba939c251ae61356e4f2ffe5ef38063 (patch)
treec9932a1a8fad17b51fdb0d9dafb257b91844be9a /www/js/DataModel.js
parent823af113dde96518f3082d0b87db7b264446e199 (diff)
add option to leave out event detection in getEvents
Diffstat (limited to 'www/js/DataModel.js')
-rw-r--r--www/js/DataModel.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 3814f21d..704a4f05 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -2708,7 +2708,7 @@ angular.module('zmApp.controllers')
// new reminder
//
//https:///zm/api/events.json?&sort=StartTime&direction=desc&page=1
- getEvents: function (monitorId, pageId, loadingStr, startTime, endTime) {
+ getEvents: function (monitorId, pageId, loadingStr, startTime, endTime, noObjectFilter) {
@@ -2746,7 +2746,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 REGEXP:detected:';
}