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

feat(node-details): move engine labels from node-details panel to engine-details panel (#2966)

pull/2926/merge
xAt0mZ 2019-06-25 01:22:45 +02:00 committed by Anthony Lapenna
parent 7a8a54c96a
commit 6591498ab9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.html
View File

@ -29,6 +29,10 @@
<td>Network Plugins</td> <td>Network Plugins</td>
<td>{{ $ctrl.engine.networkPlugins | arraytostr: ', ' }}</td> <td>{{ $ctrl.engine.networkPlugins | arraytostr: ', ' }}</td>
</tr> </tr>
<tr ng-if="$ctrl.engine.engineLabels.length">
<td>Engine Labels</td>
<td>{{ $ctrl.engine.engineLabels | labelsToStr:', ' }}</td>
</tr>
</tbody> </tbody>
</table> </table>
</rd-widget-body> </rd-widget-body>

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

@ -26,10 +26,6 @@
<td><span class="label label-{{ $ctrl.details.status | nodestatusbadge }}">{{ <td><span class="label label-{{ $ctrl.details.status | nodestatusbadge }}">{{
$ctrl.details.status }}</span></td> $ctrl.details.status }}</span></td>
</tr> </tr>
<tr ng-if=" $ctrl.details.engineLabels.length">
<td>Engine Labels</td>
<td>{{ $ctrl.details.engineLabels | labelsToStr:', ' }}</td>
</tr>
<tr> <tr>
<td> <td>
<div class="nopadding"> <div class="nopadding">

4
app/docker/views/nodes/node-details/node-details-view-controller.js
View File

@ -62,7 +62,8 @@ angular.module('portainer.docker').controller('NodeDetailsViewController', [
return { return {
releaseVersion: node.EngineVersion, releaseVersion: node.EngineVersion,
volumePlugins: transformPlugins(node.Plugins, 'Volume'), volumePlugins: transformPlugins(node.Plugins, 'Volume'),
networkPlugins: transformPlugins(node.Plugins, 'Network') networkPlugins: transformPlugins(node.Plugins, 'Network'),
engineLabels: node.EngineLabels,
}; };
} }
@ -73,7 +74,6 @@ angular.module('portainer.docker').controller('NodeDetailsViewController', [
managerAddress: node.ManagerAddr, managerAddress: node.ManagerAddr,
availability: node.Availability, availability: node.Availability,
status: node.Status, status: node.Status,
engineLabels: node.EngineLabels,
nodeLabels: node.Labels nodeLabels: node.Labels
}; };
} }