Add support for entityLabel in HTML value card, replace entityLabel on entityName, if label doesn't exist (#2239)

7 years ago · f4656f3ea0
2 changed files with 2 additions and 2 deletions
--- a/application/src/main/data/json/system/widget_bundles/cards.json
+++ b/application/src/main/data/json/system/widget_bundles/cards.json
--- a/ui/src/app/common/utils.service.js
+++ b/ui/src/app/common/utils.service.js
@ -522,7 +522,7 @@ function Utils($mdColorPalette, $rootScope, $window, $translate, $q, $timeout, t
            } else if (variableName === 'deviceName') {
                label = label.split(variable).join(datasource.entityName);
            } else if (variableName === 'entityLabel') {
-                label = label.split(variable).join(datasource.entityLabel);
+                label = label.split(variable).join(datasource.entityLabel || datasource.entityName);
            } else if (variableName === 'aliasName') {
                label = label.split(variable).join(datasource.aliasName);
            } else if (variableName === 'entityDescription') {