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

feat(nodes): display node name when available (#2328) 

- check if the name of a node is available, otherwise default to the Hostname
pull/2330/head
Brian Kabiro 2018-10-04 02:07:31 +03:00 committed by Anthony Lapenna
parent 575735a6f7
commit f6d9a4c7c1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/docker/components/datatables/nodes-datatable/nodesDatatable.html
View File

@ -68,8 +68,8 @@
<tbody>
<tr dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit))" ng-class="{active: item.Checked}">
<td>
<a ui-sref="docker.nodes.node({id: item.Id})" ng-if="$ctrl.accessToNodeDetails">{{ item.Hostname }}</a>
<span ng-if="!$ctrl.accessToNodeDetails">{{ item.Hostname }}</span>
<a ui-sref="docker.nodes.node({id: item.Id})" ng-if="$ctrl.accessToNodeDetails">{{ item.Name || item.Hostname }}</a>
<span ng-if="!$ctrl.accessToNodeDetails">{{ item.Name || item.Hostname }}</span>
</td>
<td>{{ item.Role }}</td>
<td>{{ item.CPUs / 1000000000 }}</td>

2
app/docker/views/swarm/visualizer/swarmvisualizer.html
View File

@ -84,7 +84,7 @@
<div class="node_info">
<div>
<div>
<b>{{ node.Hostname }}</b>
<b>{{ node.Name || node.Hostname }}</b>
<span class="node_platform">
<i class="fab fa-linux" aria-hidden="true" ng-if="node.PlatformOS === 'linux'"></i>
<i class="fab fa-windows" aria-hidden="true" ng-if="node.PlatformOS === 'windows'"></i>