summaryrefslogtreecommitdiff
path: root/www/js/EventModalCtrl.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2020-10-27 19:11:22 -0400
committerPliable Pixels <pliablepixels@gmail.com>2020-10-27 19:11:22 -0400
commit24413cfc86c60da2d252b510712e4f94ac01faf8 (patch)
treedc7cc1a7ee166643e0183e7eb768e913556f30b8 /www/js/EventModalCtrl.js
parenteb32411977452d59b85a82d3580f3f97311bfa1b (diff)
#1008 reapply filters in gapless mode
Diffstat (limited to 'www/js/EventModalCtrl.js')
-rw-r--r--www/js/EventModalCtrl.js12
1 files changed, 11 insertions, 1 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 20d24531..045c8296 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -1526,6 +1526,11 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
if (loginData.enableAlarmCount && loginData.minAlarmCount)
nextEvent = nextEvent + "/"+"AlarmFrames >=:" + loginData.minAlarmCount;
}
+
+ if ($rootScope.monitorsFilter != undefined && $rootScope.monitorsFilter != '') {
+ nextEvent = nextEvent + $rootScope.monitorsFilter;
+ }
+
nextEvent = nextEvent + ".json?sort=StartTime&direction=asc&limit=1"+$rootScope.authSession;
@@ -1537,10 +1542,15 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
if (loginData.enableAlarmCount && loginData.minAlarmCount)
prevEvent = prevEvent + "/"+"AlarmFrames >=:" + loginData.minAlarmCount;
}
- prevEvent = prevEvent + ".json?sort=StartTime&direction=desc&limit=1"+$rootScope.authSession;
+ if ($rootScope.monitorsFilter != undefined && $rootScope.monitorsFilter != '') {
+ prevEvent = prevEvent + $rootScope.monitorsFilter;
+ }
+
+ prevEvent = prevEvent + ".json?sort=StartTime&direction=desc&limit=1"+$rootScope.authSession;
+ //console.log ("FILTER IS "+$rootScope.monitorsFilter);
NVR.debug("Neighbor next URL=" + nextEvent);
NVR.debug("Neighbor pre URL=" + prevEvent);