summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/js/EventServerSettingsCtrl.js5
-rw-r--r--www/templates/eventserversettings.html8
2 files changed, 7 insertions, 6 deletions
diff --git a/www/js/EventServerSettingsCtrl.js b/www/js/EventServerSettingsCtrl.js
index 3763973a..ecc53c9e 100644
--- a/www/js/EventServerSettingsCtrl.js
+++ b/www/js/EventServerSettingsCtrl.js
@@ -76,7 +76,8 @@ angular.module('zmApp.controllers').controller('zmApp.EventServerSettingsCtrl',
}
if ($scope.monitors[i].Monitor.isChecked) {
monstring = monstring + $scope.monitors[i].Monitor.Id + ",";
- var tint = isNaN($scope.monitors[i].Monitor.reportingInterval) ? 0 : parseInt($scope.monitors[i].Monitor.reportingInterval);
+ var tint = parseInt($scope.monitors[i].Monitor.reportingInterval);
+ if (isNaN(tint)) tint = 0;
intervalstring = intervalstring + tint + ",";
}
@@ -104,7 +105,7 @@ angular.module('zmApp.controllers').controller('zmApp.EventServerSettingsCtrl',
EventServer.sendMessage("control", {
type: 'filter',
monlist: monstring,
- intervalist: intervalstring
+ intlist: intervalstring
});
});
}
diff --git a/www/templates/eventserversettings.html b/www/templates/eventserversettings.html
index 74c05b20..68e9f1be 100644
--- a/www/templates/eventserversettings.html
+++ b/www/templates/eventserversettings.html
@@ -46,11 +46,11 @@
<ion-item class="item-accordion"
ng-show="isGroupShown(monitor)">
- <div class=" item-input-inset">
- <label class="item-input-wrapper">
- <input type="tel" placeholder="sec." ng-model="monitor.Monitor.reportingInterval">
+ <div class="item-input-inset" >
+ <label class="item-input-wrapper" >
+ <input type="tel" placeholder="sec." ng-model="monitor.Monitor.reportingInterval">
</label>
- &nbsp;min. reporting interval
+ &nbsp;minimum interval
</div>