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

table settings propagated through nested tables (#5699)

pull/5710/head
zees-dev 2021-09-22 13:42:13 +12:00 committed by GitHub
parent 0efbf5bbf3
commit 092d217985
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
View File

@ -231,6 +231,7 @@
<kubernetes-applications-datatable <kubernetes-applications-datatable
dataset="item.KubernetesApplications" dataset="item.KubernetesApplications"
table-key="{{ item.Id }}_table" table-key="{{ item.Id }}_table"
settings-key="{{ $ctrl.tableKey }}"
order-by="Name" order-by="Name"
remove-action="$ctrl.removeAction" remove-action="$ctrl.removeAction"
refresh-callback="$ctrl.refreshCallback" refresh-callback="$ctrl.refreshCallback"

1
app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.js
View File

@ -8,6 +8,7 @@ angular.module('portainer.kubernetes').component('kubernetesApplicationsDatatabl
titleIcon: '@', titleIcon: '@',
dataset: '<', dataset: '<',
tableKey: '@', tableKey: '@',
settingsKey: '@',
orderBy: '@', orderBy: '@',
reverseOrder: '<', reverseOrder: '<',
removeAction: '<', removeAction: '<',

2
app/kubernetes/components/datatables/applications-datatable/applicationsDatatableController.js
View File

@ -147,7 +147,7 @@ angular.module('portainer.docker').controller('KubernetesApplicationsDatatableCo
this.expandItems(storedExpandedItems); this.expandItems(storedExpandedItems);
} }
const storedSettings = DatatableService.getDataTableSettings(this.tableKey); const storedSettings = DatatableService.getDataTableSettings(this.settingsKey);
if (storedSettings !== null) { if (storedSettings !== null) {
this.settings = storedSettings; this.settings = storedSettings;
this.settings.open = false; this.settings.open = false;

1
app/kubernetes/views/applications/applications.html
View File

@ -15,6 +15,7 @@
<kubernetes-applications-datatable <kubernetes-applications-datatable
dataset="ctrl.state.applications" dataset="ctrl.state.applications"
table-key="kubernetes.applications" table-key="kubernetes.applications"
settings-key="kubernetes.applications"
order-by="Name" order-by="Name"
remove-action="ctrl.removeAction" remove-action="ctrl.removeAction"
refresh-callback="ctrl.getApplications" refresh-callback="ctrl.getApplications"