summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/js/MonitorCtrl.js8
-rw-r--r--www/templates/monitors.html2
2 files changed, 9 insertions, 1 deletions
diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js
index e36d233d..45d0d9a5 100644
--- a/www/js/MonitorCtrl.js
+++ b/www/js/MonitorCtrl.js
@@ -65,6 +65,14 @@ angular.module('zmApp.controllers')
}
};
+ $scope.gotoEvents = function (mid) {
+ $state.go("app.events", {
+ "id": mid,
+ "playEvent": false
+ });
+ return;
+ };
+
function noop() {}
//-----------------------------------------------------------------------
// This function takes care of changing monitor parameters
diff --git a/www/templates/monitors.html b/www/templates/monitors.html
index c202f1c4..691a6844 100644
--- a/www/templates/monitors.html
+++ b/www/templates/monitors.html
@@ -57,7 +57,7 @@
<div style="float:right;">
<a class="button button-small icon icon-left icon ion-gear-a" href="" ng-click="changeConfig(monitor.Monitor.Name, monitor.Monitor.Id,monitor.Monitor.Enabled,monitor.Monitor.Function);">{{'kConfiguration'
| translate}}</a>
- <a class="button button-small icon icon-left ion-calendar" href="#/app/events/{{monitor.Monitor.Id}}/false">{{'kEventsCap'|translate}}</a>
+ <a class="button button-small icon icon-left ion-calendar" ng-click="gotoEvents(monitor.Monitor.Id)">{{'kEventsCap'|translate}}</a>
<a class="button button-small icon icon-left ion-ios-eye" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey, monitor)">{{'kLiveView'
| translate}} </a>
</div>