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

feat(networks): add details about the attachable/internal properties (#2200)

pull/2197/head^2
Luca 2018-08-22 08:45:14 +02:00 committed by Anthony Lapenna
parent e8ab89ae79
commit 68d77e5e0e
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/docker/components/datatables/networks-datatable/networksDatatable.html
View File

@ -55,6 +55,20 @@
<i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Driver' && $ctrl.state.reverseOrder"></i> <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Driver' && $ctrl.state.reverseOrder"></i>
</a> </a>
</th> </th>
<th>
<a ng-click="$ctrl.changeOrderBy('Attachable')">
Attachable
<i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Attachable' && !$ctrl.state.reverseOrder"></i>
<i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Attachable' && $ctrl.state.reverseOrder"></i>
</a>
</th>
<th>
<a ng-click="$ctrl.changeOrderBy('Internal')">
Internal
<i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Internal' && !$ctrl.state.reverseOrder"></i>
<i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Internal' && $ctrl.state.reverseOrder"></i>
</a>
</th>
<th> <th>
<a ng-click="$ctrl.changeOrderBy('IPAM.Driver')"> <a ng-click="$ctrl.changeOrderBy('IPAM.Driver')">
IPAM Driver IPAM Driver
@ -104,6 +118,8 @@
<td>{{ item.StackName ? item.StackName : '-' }}</td> <td>{{ item.StackName ? item.StackName : '-' }}</td>
<td>{{ item.Scope }}</td> <td>{{ item.Scope }}</td>
<td>{{ item.Driver }}</td> <td>{{ item.Driver }}</td>
<td>{{ item.Attachable }}</td>
<td>{{ item.Internal }}</td>
<td>{{ item.IPAM.Driver }}</td> <td>{{ item.IPAM.Driver }}</td>
<td>{{ item.IPAM.Config[0].Subnet ? item.IPAM.Config[0].Subnet : '-' }}</td> <td>{{ item.IPAM.Config[0].Subnet ? item.IPAM.Config[0].Subnet : '-' }}</td>
<td>{{ item.IPAM.Config[0].Gateway ? item.IPAM.Config[0].Gateway : '-' }}</td> <td>{{ item.IPAM.Config[0].Gateway ? item.IPAM.Config[0].Gateway : '-' }}</td>

1
app/docker/models/network.js
View File

@ -4,6 +4,7 @@ function NetworkViewModel(data) {
this.Scope = data.Scope; this.Scope = data.Scope;
this.Driver = data.Driver; this.Driver = data.Driver;
this.Attachable = data.Attachable; this.Attachable = data.Attachable;
this.Internal = data.Internal;
this.IPAM = data.IPAM; this.IPAM = data.IPAM;
this.Containers = data.Containers; this.Containers = data.Containers;
this.Options = data.Options; this.Options = data.Options;

8
app/docker/views/networks/edit/network.html
View File

@ -31,6 +31,14 @@
<td>Scope</td> <td>Scope</td>
<td>{{ network.Scope }}</td> <td>{{ network.Scope }}</td>
</tr> </tr>
<tr>
<td>Attachable</td>
<td>{{ network.Attachable }}</td>
</tr>
<tr>
<td>Internal</td>
<td>{{ network.Internal }}</td>
</tr>
<tr ng-if="network.IPAM.Config[0].Subnet"> <tr ng-if="network.IPAM.Config[0].Subnet">
<td>Subnet</td> <td>Subnet</td>
<td>{{ network.IPAM.Config[0].Subnet }}</td> <td>{{ network.IPAM.Config[0].Subnet }}</td>