diff options
Diffstat (limited to 'www/js/MontageCtrl.js')
| -rw-r--r-- | www/js/MontageCtrl.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 1859e866..bff471d3 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -293,14 +293,15 @@ angular.module('zmApp.controllers') function loadAlarmStatus() { - if (NVRDataModel.versionCompare($rootScope.apiVersion, "1.30") == -1) { + if ((NVRDataModel.versionCompare($rootScope.apiVersion, "1.30") == -1) || + (NVRDataModel.getBandwidth() == 'lowbw') || + (NVRDataModel.getLogin().disableAlarmCheckMontage == true)) + { return; } - if (NVRDataModel.getBandwidth() == 'lowbw') { - return; - } + for (var i = 0; i < $scope.MontageMonitors.length; i++) { if (($scope.MontageMonitors[i].Monitor.Function == 'None') || |