Browse Source

Merge branch 'master' of https://github.com/thingsboard/thingsboard

pull/3974/head
lsyer 6 years ago
parent
commit
2657d1af44
  1. 2
      application/src/main/java/org/thingsboard/server/controller/DashboardController.java
  2. 6
      ui-ngx/src/app/shared/models/rule-node.models.ts

2
application/src/main/java/org/thingsboard/server/controller/DashboardController.java

@ -212,7 +212,7 @@ public class DashboardController extends BaseController {
@RequestMapping(value = "/dashboard/{dashboardId}/customers", method = RequestMethod.POST) @RequestMapping(value = "/dashboard/{dashboardId}/customers", method = RequestMethod.POST)
@ResponseBody @ResponseBody
public Dashboard updateDashboardCustomers(@PathVariable(DASHBOARD_ID) String strDashboardId, public Dashboard updateDashboardCustomers(@PathVariable(DASHBOARD_ID) String strDashboardId,
@RequestBody String[] strCustomerIds) throws ThingsboardException { @RequestBody(required = false) String[] strCustomerIds) throws ThingsboardException {
checkParameter(DASHBOARD_ID, strDashboardId); checkParameter(DASHBOARD_ID, strDashboardId);
try { try {
DashboardId dashboardId = new DashboardId(toUUID(strDashboardId)); DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));

6
ui-ngx/src/app/shared/models/rule-node.models.ts

@ -349,7 +349,8 @@ export enum MessageType {
ENTITY_UNASSIGNED = 'ENTITY_UNASSIGNED', ENTITY_UNASSIGNED = 'ENTITY_UNASSIGNED',
ATTRIBUTES_UPDATED = 'ATTRIBUTES_UPDATED', ATTRIBUTES_UPDATED = 'ATTRIBUTES_UPDATED',
ATTRIBUTES_DELETED = 'ATTRIBUTES_DELETED', ATTRIBUTES_DELETED = 'ATTRIBUTES_DELETED',
TIMESERIES_UPDATED = 'TIMESERIES_UPDATED' TIMESERIES_UPDATED = 'TIMESERIES_UPDATED',
TIMESERIES_DELETED = 'TIMESERIES_DELETED'
} }
export const messageTypeNames = new Map<MessageType, string>( export const messageTypeNames = new Map<MessageType, string>(
@ -369,7 +370,8 @@ export const messageTypeNames = new Map<MessageType, string>(
[MessageType.ENTITY_UNASSIGNED, 'Entity Unassigned'], [MessageType.ENTITY_UNASSIGNED, 'Entity Unassigned'],
[MessageType.ATTRIBUTES_UPDATED, 'Attributes Updated'], [MessageType.ATTRIBUTES_UPDATED, 'Attributes Updated'],
[MessageType.ATTRIBUTES_DELETED, 'Attributes Deleted'], [MessageType.ATTRIBUTES_DELETED, 'Attributes Deleted'],
[MessageType.TIMESERIES_UPDATED, 'Timeseries Updated'] [MessageType.TIMESERIES_UPDATED, 'Timeseries Updated'],
[MessageType.TIMESERIES_DELETED, 'Timeseries Deleted']
] ]
); );

Loading…
Cancel
Save