From 89a701226df0c65355108f187d29ac3b5051e2f8 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Wed, 10 Oct 2018 17:11:05 +0300 Subject: [PATCH] Misc fixes after review --- .../engine/action/TbCopyAttributesToEntityViewNode.java | 2 +- ui/src/app/entity/entity-subtype-list.directive.js | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNode.java index 40e00ec009..51386dc942 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNode.java @@ -48,7 +48,7 @@ import static org.thingsboard.rule.engine.api.TbRelationTypes.SUCCESS; @Slf4j @RuleNode( type = ComponentType.ACTION, - name = "copy attributes", + name = "copy to view", configClazz = EmptyNodeConfiguration.class, nodeDescription = "Copy attributes from asset/device to entity view and changes message originator to related entity view", nodeDetails = "Copy attributes from asset/device to related entity view according to entity view configuration. \n " + diff --git a/ui/src/app/entity/entity-subtype-list.directive.js b/ui/src/app/entity/entity-subtype-list.directive.js index 2da948d435..43bb21f7a9 100644 --- a/ui/src/app/entity/entity-subtype-list.directive.js +++ b/ui/src/app/entity/entity-subtype-list.directive.js @@ -47,6 +47,12 @@ export default function EntitySubtypeListDirective($compile, $templateCache, $q, scope.secondaryPlaceholder = '+' + $translate.instant('device.device-type'); scope.noSubtypesMathingText = 'device.no-device-types-matching'; scope.subtypeListEmptyText = 'device.device-type-list-empty'; + } else if (scope.entityType == types.entityType.entityView) { + scope.placeholder = scope.tbRequired ? $translate.instant('entity-view.enter-entity-view-type') + : $translate.instant('entity-view.any-entity-view'); + scope.secondaryPlaceholder = '+' + $translate.instant('entity-view.entity-view-type'); + scope.noSubtypesMathingText = 'entity-view.no-entity-view-types-matching'; + scope.subtypeListEmptyText = 'entity-view.entity-view-type-list-empty'; } scope.$watch('tbRequired', function () {