dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Fix alarms table widget.

Browse Source
This commit is contained in:
Igor Kulikov 2017-12-22 12:57:51 +02:00
parent 84ed34d4f0
commit 0b7754c1c0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/src/app/widget/lib/alarms-table-widget.js
View File

@ -124,7 +124,7 @@ function AlarmsTableWidgetController($element, $scope, $filter, $mdMedia, $mdDia
$scope.$on('alarms-table-data-updated', function(event, tableId) { $scope.$on('alarms-table-data-updated', function(event, tableId) {
if (vm.tableId == tableId) { if (vm.tableId == tableId) {
if (vm.subscription) { if (vm.subscription) {
vm.allAlarms = vm.subscription.alarms; vm.allAlarms = vm.subscription.alarms || [];
updateAlarms(true); updateAlarms(true);
$scope.$digest(); $scope.$digest();
} }
@ -298,7 +298,7 @@ function AlarmsTableWidgetController($element, $scope, $filter, $mdMedia, $mdDia
entityId = vm.currentAlarm.originator; entityId = vm.currentAlarm.originator;
entityName = vm.currentAlarm.originatorName; entityName = vm.currentAlarm.originatorName;
} }
vm.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName, { alarm: vm.currentAlarm }); vm.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName, { alarm: alarm });
} }
} }
@ -312,7 +312,7 @@ function AlarmsTableWidgetController($element, $scope, $filter, $mdMedia, $mdDia
entityId = alarm.originator; entityId = alarm.originator;
entityName = alarm.originatorName; entityName = alarm.originatorName;
} }
vm.ctx.actionsApi.handleWidgetAction($event, actionDescriptor, entityId, entityName, { alarm: vm.currentAlarm }); vm.ctx.actionsApi.handleWidgetAction($event, actionDescriptor, entityId, entityName, { alarm: alarm });
} }
function isCurrent(alarm) { function isCurrent(alarm) {