diff options
Diffstat (limited to 'www/js/DataModel.js')
| -rw-r--r-- | www/js/DataModel.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index d7bffdb1..704a4f05 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -20,7 +20,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.3.032"; + var zmAppVersion = "1.3.033"; var isBackground = false; var justResumed = false; var timeSinceResumed = -1; @@ -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:'; } |