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

Merge pull request #1120 from Terny22/master

Browse Source 
Fixed issue with header-actions in rpc-widgets
This commit is contained in:
Andrew Shvayka 2018-10-05 17:49:00 +03:00 committed by GitHub
commit 1a97b10a60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/app/api/subscription.js
View File

@ -172,9 +172,9 @@ export default class Subscription {
if (this.type === this.ctx.types.widgetType.rpc.value) { if (this.type === this.ctx.types.widgetType.rpc.value) {
if (this.targetDeviceId) { if (this.targetDeviceId) {
entityId = { entityId = {
entityType: this.ctx.entityType.device, entityType: this.ctx.types.entityType.device,
id: this.targetDeviceId id: this.targetDeviceId
} };
entityName = this.targetDeviceName; entityName = this.targetDeviceName;
} }
} else if (this.type == this.ctx.types.widgetType.alarm.value) { } else if (this.type == this.ctx.types.widgetType.alarm.value) {
@ -182,7 +182,7 @@ export default class Subscription {
entityId = { entityId = {
entityType: this.alarmSource.entityType, entityType: this.alarmSource.entityType,
id: this.alarmSource.entityId id: this.alarmSource.entityId
} };
entityName = this.alarmSource.entityName; entityName = this.alarmSource.entityName;
} }
} else { } else {
@ -192,7 +192,7 @@ export default class Subscription {
entityId = { entityId = {
entityType: datasource.entityType, entityType: datasource.entityType,
id: datasource.entityId id: datasource.entityId
} };
entityName = datasource.entityName; entityName = datasource.entityName;
break; break;
} }