diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2020-09-06 08:01:48 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2020-09-06 08:01:48 -0400 |
| commit | 1bd8fd4419bb43519b0194d7504f69166b1b4917 (patch) | |
| tree | ca8f41fb330cb0146c8229fefc6df6defa3e1e3c /www/js/EventModalCtrl.js | |
| parent | 99154f9d7ed03e8f818c56055591cdb3774f669d (diff) | |
don't add alarm frames if 0
Diffstat (limited to 'www/js/EventModalCtrl.js')
| -rw-r--r-- | www/js/EventModalCtrl.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index c62c2cf6..e91bea99 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -1510,7 +1510,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro "/StartTime >:" + currentEvent.Event.StartTime + ($scope.followSameMonitor == '1' ? "/"+"MonitorId =:" + currentEvent.Monitor.Id : "") ; if ($scope.useFilters) { - nextEvent = nextEvent + "/"+"AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); + if (loginData.enableAlarmCount && loginData.minAlarmCount) + nextEvent = nextEvent + "/"+"AlarmFrames >=:" + loginData.minAlarmCount; } nextEvent = nextEvent + ".json?sort=StartTime&direction=asc&limit=1"+$rootScope.authSession; @@ -1520,7 +1521,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro ($scope.followSameMonitor == '1' ? "/"+"MonitorId =:"+ currentEvent.Monitor.Id : ""); if ($scope.useFilters) { - prevEvent = prevEvent + "/"+"AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); + if (loginData.enableAlarmCount && loginData.minAlarmCount) + prevEvent = prevEvent + "/"+"AlarmFrames >=:" + loginData.minAlarmCount; } prevEvent = prevEvent + ".json?sort=StartTime&direction=desc&limit=1"+$rootScope.authSession; |