From 0fb45425bb8a8d28a91c3142cb7c0a8b7321ea97 Mon Sep 17 00:00:00 2001
From: Paolo Cristiani <42511852+pgrisu@users.noreply.github.com>
Date: Wed, 3 Jul 2019 16:33:06 +0200
Subject: [PATCH] fix entities-table widget for wrong dataKey value when same
 key is used on multiple columns with different processing function (#1827)

---
 ui/src/app/widget/lib/entities-table-widget.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/src/app/widget/lib/entities-table-widget.js b/ui/src/app/widget/lib/entities-table-widget.js
index c7bd650f40..4f0fb199c4 100644
--- a/ui/src/app/widget/lib/entities-table-widget.js
+++ b/ui/src/app/widget/lib/entities-table-widget.js
@@ -390,7 +390,7 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $mdP
     );
 
     function getEntityValue(entity, key) {
-        return getDescendantProp(entity, key.name);
+        return getDescendantProp(entity, key.label);
     }
 
     function updateEntitiesData(data) {
@@ -403,9 +403,9 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $mdP
                     var keyData = data[index].data;
                     if (keyData && keyData.length && keyData[0].length > 1) {
                         var value = keyData[0][1];
-                        entity[dataKey.name] = value;
+                        entity[dataKey.label] = value;
                     } else {
-                        entity[dataKey.name] = '';
+                        entity[dataKey.label] = '';
                     }
                 }
             }
@@ -568,7 +568,7 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $mdP
             }
             for (d = 0; d < vm.dataKeys.length; d++) {
                 dataKey = vm.dataKeys[d];
-                entity[dataKey.name] = '';
+                entity[dataKey.label] = '';
             }
             vm.allEntities.push(entity);
         }