Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-19 13:29:41 +02:00
Code Issues Releases Activity

fix(datatables): saved orderBy was always overridden by the default one (#3052)

Browse source
This commit is contained in:
xAt0mZ 2019-08-12 16:25:35 +02:00 • committed by GitHub
parent 3afeb13891
commit 24013bc524
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/docker/components/datatables/containers-datatable/containersDatatableController.js
View file

@ -172,6 +172,7 @@ function ($scope, $controller, DatatableService, EndpointProvider) {
this.setDefaults();
this.prepareTableFromDataset();
this.state.orderBy = this.orderBy;
var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
if (storedOrder !== null) {
this.state.reverseOrder = storedOrder.reverse;
@ -203,6 +204,5 @@ function ($scope, $controller, DatatableService, EndpointProvider) {
this.columnVisibility = storedColumnVisibility;
this.columnVisibility.state.open = false;
}
this.state.orderBy = this.orderBy;
};
}]);

2
app/docker/components/datatables/host-jobs-datatable/jobsDatatableController.js
View file

@ -108,6 +108,7 @@ angular.module('portainer.docker')
this.setDefaults();
this.prepareTableFromDataset();
this.state.orderBy = this.orderBy;
var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
if (storedOrder !== null) {
this.state.reverseOrder = storedOrder.reverse;
@ -135,7 +136,6 @@ angular.module('portainer.docker')
this.settings.open = false;
}
this.onSettingsRepeaterChange();
this.state.orderBy = this.orderBy;
};
}
]);

2
app/docker/components/datatables/images-datatable/imagesDatatableController.js
View file

@ -39,6 +39,7 @@ function ($scope, $controller, DatatableService) {
this.setDefaults();
this.prepareTableFromDataset();
this.state.orderBy = this.orderBy;
var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
if (storedOrder !== null) {
this.state.reverseOrder = storedOrder.reverse;
@ -66,6 +67,5 @@ function ($scope, $controller, DatatableService) {
}
this.onSettingsRepeaterChange();
this.state.orderBy = this.orderBy;
};
}]);

2
app/docker/components/datatables/networks-datatable/networksDatatableController.js
View file

@ -19,6 +19,7 @@ angular.module('portainer.docker')
this.setDefaults();
this.prepareTableFromDataset();
this.state.orderBy = this.orderBy;
var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
if (storedOrder !== null) {
this.state.reverseOrder = storedOrder.reverse;
@ -45,7 +46,6 @@ angular.module('portainer.docker')
this.settings.open = false;
}
this.onSettingsRepeaterChange();
this.state.orderBy = this.orderBy;
};
}
]);

2
app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatableController.js
View file

@ -61,6 +61,7 @@ angular.module('portainer.docker')
this.setDefaults();
this.prepareTableFromDataset();
this.state.orderBy = this.orderBy;
var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
if (storedOrder !== null) {
this.state.reverseOrder = storedOrder.reverse;
@ -87,7 +88,6 @@ angular.module('portainer.docker')
this.settings.open = false;
}
this.onSettingsRepeaterChange();
this.state.orderBy = this.orderBy;
};
}
]);

2
app/docker/components/datatables/services-datatable/servicesDatatableController.js
View file

@ -68,6 +68,7 @@ function ($scope, $controller, DatatableService, EndpointProvider) {
this.setDefaults();
this.prepareTableFromDataset();
this.state.orderBy = this.orderBy;
var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
if (storedOrder !== null) {
this.state.reverseOrder = storedOrder.reverse;
@ -99,6 +100,5 @@ function ($scope, $controller, DatatableService, EndpointProvider) {
this.settings.open = false;
}
this.onSettingsRepeaterChange();
this.state.orderBy = this.orderBy;
};
}]);

2
app/docker/components/datatables/tasks-datatable/tasksDatatableController.js
View file

@ -16,6 +16,7 @@ function ($scope, $controller, DatatableService) {
this.setDefaults();
this.prepareTableFromDataset();
this.state.orderBy = this.orderBy;
var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
if (storedOrder !== null) {
this.state.reverseOrder = storedOrder.reverse;
@ -42,6 +43,5 @@ function ($scope, $controller, DatatableService) {
this.settings.open = false;
}
this.onSettingsRepeaterChange();
this.state.orderBy = this.orderBy;
};
}]);

2
app/docker/components/datatables/volumes-datatable/volumesDatatableController.js
View file

@ -39,6 +39,7 @@ function ($scope, $controller, DatatableService) {
this.setDefaults();
this.prepareTableFromDataset();
this.state.orderBy = this.orderBy;
var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
if (storedOrder !== null) {
this.state.reverseOrder = storedOrder.reverse;
@ -65,6 +66,5 @@ function ($scope, $controller, DatatableService) {
this.settings.open = false;
}
this.onSettingsRepeaterChange();
this.state.orderBy = this.orderBy;
};
}]);