Commit 940c81b095a33810dc7927b29bf7f7213dca29ca
Merge branch 'master' of github.com:thingsboard/thingsboard
Showing
2 changed files
with
3 additions
and
3 deletions
| @@ -518,7 +518,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor { | @@ -518,7 +518,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor { | ||
| 518 | String payload = hasError ? responseMsg.getError() : responseMsg.getPayload(); | 518 | String payload = hasError ? responseMsg.getError() : responseMsg.getPayload(); |
| 519 | systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor( | 519 | systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor( |
| 520 | new FromDeviceRpcResponse(requestMd.getMsg().getMsg().getId(), | 520 | new FromDeviceRpcResponse(requestMd.getMsg().getMsg().getId(), |
| 521 | - payload, hasError ? RpcError.INTERNAL : null)); | 521 | + payload, null)); |
| 522 | if (requestMd.getMsg().getMsg().isPersisted()) { | 522 | if (requestMd.getMsg().getMsg().isPersisted()) { |
| 523 | RpcStatus status = hasError ? RpcStatus.FAILED : RpcStatus.SUCCESSFUL; | 523 | RpcStatus status = hasError ? RpcStatus.FAILED : RpcStatus.SUCCESSFUL; |
| 524 | JsonNode response; | 524 | JsonNode response; |
| @@ -495,8 +495,8 @@ export class MultipleInputWidgetComponent extends PageComponent implements OnIni | @@ -495,8 +495,8 @@ export class MultipleInputWidgetComponent extends PageComponent implements OnIni | ||
| 495 | const serverAttributes: AttributeData[] = []; | 495 | const serverAttributes: AttributeData[] = []; |
| 496 | const sharedAttributes: AttributeData[] = []; | 496 | const sharedAttributes: AttributeData[] = []; |
| 497 | const telemetry: AttributeData[] = []; | 497 | const telemetry: AttributeData[] = []; |
| 498 | - for (const key of this.visibleKeys(toSave)) { | ||
| 499 | - const currentValue = this.multipleInputFormGroup.get(key.formId).value; | 498 | + for (const key of toSave.keys) { |
| 499 | + const currentValue = key.settings.dataKeyHidden ? key.value : this.multipleInputFormGroup.get(key.formId).value; | ||
| 500 | if (!isEqual(currentValue, key.value) || this.settings.updateAllValues) { | 500 | if (!isEqual(currentValue, key.value) || this.settings.updateAllValues) { |
| 501 | const attribute: AttributeData = { | 501 | const attribute: AttributeData = { |
| 502 | key: key.name, | 502 | key: key.name, |