github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(node-details): engine labels were displayed as Objects (#2858)

pull/2871/head
baron_l 2019-05-01 22:37:24 +02:00 committed by Anthony Lapenna
parent 80c5052b55
commit 7b3ef7f1a2
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html
View File

@ -28,7 +28,7 @@
</tr> </tr>
<tr ng-if=" $ctrl.details.engineLabels.length"> <tr ng-if=" $ctrl.details.engineLabels.length">
<td>Engine Labels</td> <td>Engine Labels</td>
<td>{{ $ctrl.details.engineLabels | arraytostr:', ' }}</td> <td>{{ $ctrl.details.engineLabels | labelsToStr:', ' }}</td>
</tr> </tr>
<tr> <tr>
<td> <td>

9
app/portainer/filters/filters.js
View File

@ -106,6 +106,15 @@ angular.module('portainer.app')
return ''; return '';
}; };
}) })
.filter('labelsToStr', function () {
'use strict';
return function (arr, separator) {
if (arr) {
return _.join(arr.map((item) => item.key + ':' + item.value), separator);
}
return '';
};
})
.filter('endpointtypename', function () { .filter('endpointtypename', function () {
'use strict'; 'use strict';
return function (type) { return function (type) {