From 24013bc5243c6936a92c0a045dda7f94c5eae688 Mon Sep 17 00:00:00 2001 From: xAt0mZ Date: Mon, 12 Aug 2019 16:25:35 +0200 Subject: [PATCH] fix(datatables): saved orderBy was always overridden by the default one (#3052) --- .../containers-datatable/containersDatatableController.js | 2 +- .../datatables/host-jobs-datatable/jobsDatatableController.js | 2 +- .../datatables/images-datatable/imagesDatatableController.js | 2 +- .../networks-datatable/networksDatatableController.js | 2 +- .../service-tasks-datatable/serviceTasksDatatableController.js | 2 +- .../services-datatable/servicesDatatableController.js | 2 +- .../datatables/tasks-datatable/tasksDatatableController.js | 2 +- .../datatables/volumes-datatable/volumesDatatableController.js | 2 +- .../drives-datatable/storidgeDrivesDatatableController.js | 2 +- .../nodes-datatable/storidgeNodesDatatableController.js | 2 +- .../components/access-datatable/accessDatatableController.js | 2 +- .../components/datatables/genericDatatableController.js | 2 +- .../schedules-datatable/schedulesDatatableController.js | 2 +- .../datatables/stacks-datatable/stacksDatatableController.js | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/docker/components/datatables/containers-datatable/containersDatatableController.js b/app/docker/components/datatables/containers-datatable/containersDatatableController.js index 929686a60..c95cc7d69 100644 --- a/app/docker/components/datatables/containers-datatable/containersDatatableController.js +++ b/app/docker/components/datatables/containers-datatable/containersDatatableController.js @@ -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; }; }]); diff --git a/app/docker/components/datatables/host-jobs-datatable/jobsDatatableController.js b/app/docker/components/datatables/host-jobs-datatable/jobsDatatableController.js index 4acc5472a..c95cd9ef3 100644 --- a/app/docker/components/datatables/host-jobs-datatable/jobsDatatableController.js +++ b/app/docker/components/datatables/host-jobs-datatable/jobsDatatableController.js @@ -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; }; } ]); diff --git a/app/docker/components/datatables/images-datatable/imagesDatatableController.js b/app/docker/components/datatables/images-datatable/imagesDatatableController.js index 67bb932e2..55e96f36a 100644 --- a/app/docker/components/datatables/images-datatable/imagesDatatableController.js +++ b/app/docker/components/datatables/images-datatable/imagesDatatableController.js @@ -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; }; }]); diff --git a/app/docker/components/datatables/networks-datatable/networksDatatableController.js b/app/docker/components/datatables/networks-datatable/networksDatatableController.js index 1fcaec634..f079bda46 100644 --- a/app/docker/components/datatables/networks-datatable/networksDatatableController.js +++ b/app/docker/components/datatables/networks-datatable/networksDatatableController.js @@ -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; }; } ]); \ No newline at end of file diff --git a/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatableController.js b/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatableController.js index 23f5c8e72..7e6afa667 100644 --- a/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatableController.js +++ b/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatableController.js @@ -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; }; } ]); diff --git a/app/docker/components/datatables/services-datatable/servicesDatatableController.js b/app/docker/components/datatables/services-datatable/servicesDatatableController.js index 13a4314e1..9289733e8 100644 --- a/app/docker/components/datatables/services-datatable/servicesDatatableController.js +++ b/app/docker/components/datatables/services-datatable/servicesDatatableController.js @@ -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; }; }]); diff --git a/app/docker/components/datatables/tasks-datatable/tasksDatatableController.js b/app/docker/components/datatables/tasks-datatable/tasksDatatableController.js index 0d8c4d1f2..ab2456b27 100644 --- a/app/docker/components/datatables/tasks-datatable/tasksDatatableController.js +++ b/app/docker/components/datatables/tasks-datatable/tasksDatatableController.js @@ -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; }; }]); diff --git a/app/docker/components/datatables/volumes-datatable/volumesDatatableController.js b/app/docker/components/datatables/volumes-datatable/volumesDatatableController.js index 68cc70055..5a49ea70d 100644 --- a/app/docker/components/datatables/volumes-datatable/volumesDatatableController.js +++ b/app/docker/components/datatables/volumes-datatable/volumesDatatableController.js @@ -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; }; }]); diff --git a/app/integrations/storidge/components/drives-datatable/storidgeDrivesDatatableController.js b/app/integrations/storidge/components/drives-datatable/storidgeDrivesDatatableController.js index 68348427b..5e0b6c33d 100644 --- a/app/integrations/storidge/components/drives-datatable/storidgeDrivesDatatableController.js +++ b/app/integrations/storidge/components/drives-datatable/storidgeDrivesDatatableController.js @@ -11,6 +11,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; @@ -37,7 +38,6 @@ angular.module('portainer.docker') this.settings.open = false; } this.onSettingsRepeaterChange(); - this.state.orderBy = this.orderBy; }; } ]); \ No newline at end of file diff --git a/app/integrations/storidge/components/nodes-datatable/storidgeNodesDatatableController.js b/app/integrations/storidge/components/nodes-datatable/storidgeNodesDatatableController.js index 61e8fec46..7a1d263af 100644 --- a/app/integrations/storidge/components/nodes-datatable/storidgeNodesDatatableController.js +++ b/app/integrations/storidge/components/nodes-datatable/storidgeNodesDatatableController.js @@ -25,6 +25,7 @@ function($scope, $controller, clipboard, Notifications, StoridgeNodeService, Dat this.setDefaults(); this.prepareTableFromDataset(); + this.state.orderBy = this.orderBy; var storedOrder = DatatableService.getDataTableOrder(this.tableKey); if (storedOrder !== null) { this.state.reverseOrder = storedOrder.reverse; @@ -51,6 +52,5 @@ function($scope, $controller, clipboard, Notifications, StoridgeNodeService, Dat this.settings.open = false; } this.onSettingsRepeaterChange(); - this.state.orderBy = this.orderBy; }; }]); diff --git a/app/portainer/components/access-datatable/accessDatatableController.js b/app/portainer/components/access-datatable/accessDatatableController.js index 2ed056421..c53f26c27 100644 --- a/app/portainer/components/access-datatable/accessDatatableController.js +++ b/app/portainer/components/access-datatable/accessDatatableController.js @@ -15,6 +15,7 @@ angular.module('portainer.app') this.setDefaults(); this.prepareTableFromDataset(); + this.state.orderBy = this.orderBy; var storedOrder = DatatableService.getDataTableOrder(this.tableKey); if (storedOrder !== null) { this.state.reverseOrder = storedOrder.reverse; @@ -41,7 +42,6 @@ angular.module('portainer.app') this.settings.open = false; } this.onSettingsRepeaterChange(); - this.state.orderBy = this.orderBy; }; } ]); \ No newline at end of file diff --git a/app/portainer/components/datatables/genericDatatableController.js b/app/portainer/components/datatables/genericDatatableController.js index 991869481..4658c03ea 100644 --- a/app/portainer/components/datatables/genericDatatableController.js +++ b/app/portainer/components/datatables/genericDatatableController.js @@ -119,6 +119,7 @@ function ($interval, PaginationService, DatatableService, PAGINATION_MAX_ITEMS) this.setDefaults(); this.prepareTableFromDataset(); + this.state.orderBy = this.orderBy; var storedOrder = DatatableService.getDataTableOrder(this.tableKey); if (storedOrder !== null) { this.state.reverseOrder = storedOrder.reverse; @@ -145,7 +146,6 @@ function ($interval, PaginationService, DatatableService, PAGINATION_MAX_ITEMS) this.settings.open = false; } this.onSettingsRepeaterChange(); - this.state.orderBy = this.orderBy; }; /** diff --git a/app/portainer/components/datatables/schedules-datatable/schedulesDatatableController.js b/app/portainer/components/datatables/schedules-datatable/schedulesDatatableController.js index 9a61f74d9..cba684691 100644 --- a/app/portainer/components/datatables/schedules-datatable/schedulesDatatableController.js +++ b/app/portainer/components/datatables/schedules-datatable/schedulesDatatableController.js @@ -15,6 +15,7 @@ angular.module('portainer.app') this.setDefaults(); this.prepareTableFromDataset(); + this.state.orderBy = this.orderBy; var storedOrder = DatatableService.getDataTableOrder(this.tableKey); if (storedOrder !== null) { this.state.reverseOrder = storedOrder.reverse; @@ -41,7 +42,6 @@ angular.module('portainer.app') this.settings.open = false; } this.onSettingsRepeaterChange(); - this.state.orderBy = this.orderBy; }; } ]); diff --git a/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js b/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js index 15b2a11b7..34e40387a 100644 --- a/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js +++ b/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js @@ -15,6 +15,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; @@ -41,7 +42,6 @@ function ($scope, $controller, DatatableService) { this.settings.open = false; } this.onSettingsRepeaterChange(); - this.state.orderBy = this.orderBy; }; }]);