Browse Source

fix entities-table widget for wrong dataKey value when same key is used on multiple columns with different processing function (#1827)

pull/1841/head
Paolo Cristiani 7 years ago
committed by Igor Kulikov
parent
commit
0fb45425bb
  1. 8
      ui/src/app/widget/lib/entities-table-widget.js

8
ui/src/app/widget/lib/entities-table-widget.js

@ -390,7 +390,7 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $mdP
); );
function getEntityValue(entity, key) { function getEntityValue(entity, key) {
return getDescendantProp(entity, key.name); return getDescendantProp(entity, key.label);
} }
function updateEntitiesData(data) { function updateEntitiesData(data) {
@ -403,9 +403,9 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $mdP
var keyData = data[index].data; var keyData = data[index].data;
if (keyData && keyData.length && keyData[0].length > 1) { if (keyData && keyData.length && keyData[0].length > 1) {
var value = keyData[0][1]; var value = keyData[0][1];
entity[dataKey.name] = value; entity[dataKey.label] = value;
} else { } 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++) { for (d = 0; d < vm.dataKeys.length; d++) {
dataKey = vm.dataKeys[d]; dataKey = vm.dataKeys[d];
entity[dataKey.name] = ''; entity[dataKey.label] = '';
} }
vm.allEntities.push(entity); vm.allEntities.push(entity);
} }

Loading…
Cancel
Save