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

feat(k8s/application): re-order pod/container columns in application containers table

pull/4214/head
Anthony Lapenna 2020-08-14 17:11:26 +12:00
parent 449b7888d3
commit 56cda7f260
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html
View File

@ -57,13 +57,6 @@
<table class="table table-hover nowrap-cells"> <table class="table table-hover nowrap-cells">
<thead> <thead>
<tr> <tr>
<th>
<a ng-click="$ctrl.changeOrderBy('Name')">
Name
<i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Name' && !$ctrl.state.reverseOrder"></i>
<i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Name' && $ctrl.state.reverseOrder"></i>
</a>
</th>
<th> <th>
<a ng-click="$ctrl.changeOrderBy('PodName')"> <a ng-click="$ctrl.changeOrderBy('PodName')">
Pod Pod
@ -71,6 +64,13 @@
<i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'PodName' && $ctrl.state.reverseOrder"></i> <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'PodName' && $ctrl.state.reverseOrder"></i>
</a> </a>
</th> </th>
<th>
<a ng-click="$ctrl.changeOrderBy('Name')">
Name
<i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Name' && !$ctrl.state.reverseOrder"></i>
<i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Name' && $ctrl.state.reverseOrder"></i>
</a>
</th>
<th> <th>
<a ng-click="$ctrl.changeOrderBy('Image')"> <a ng-click="$ctrl.changeOrderBy('Image')">
Image Image
@ -107,8 +107,8 @@
dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit: $ctrl.tableKey))" dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit: $ctrl.tableKey))"
pagination-id="$ctrl.tableKey" pagination-id="$ctrl.tableKey"
> >
<td>{{ item.Name }}</td>
<td>{{ item.PodName }}</td> <td>{{ item.PodName }}</td>
<td>{{ item.Name }}</td>
<td>{{ item.Image }}</td> <td>{{ item.Image }}</td>
<td <td
><span class="label label-{{ item.Status | kubernetesPodStatusColor }}">{{ item.Status }}</span></td ><span class="label label-{{ item.Status | kubernetesPodStatusColor }}">{{ item.Status }}</span></td

2
app/kubernetes/views/applications/edit/application.html
View File

@ -539,7 +539,7 @@
title-icon="fa-server" title-icon="fa-server"
dataset="ctrl.allContainers" dataset="ctrl.allContainers"
table-key="kubernetes.application.containers" table-key="kubernetes.application.containers"
order-by="Name" order-by="PodName"
> >
</kubernetes-containers-datatable> </kubernetes-containers-datatable>
</div> </div>