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

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

pull/3086/head
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
Show Stats 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;
};
}]);

2
app/integrations/storidge/components/drives-datatable/storidgeDrivesDatatableController.js
View File

@ -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;
};
}
]);

2
app/integrations/storidge/components/nodes-datatable/storidgeNodesDatatableController.js
View File

@ -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;
};
}]);

2
app/portainer/components/access-datatable/accessDatatableController.js
View File

@ -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;
};
}
]);

2
app/portainer/components/datatables/genericDatatableController.js
View File

@ -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;
};
/**

2
app/portainer/components/datatables/schedules-datatable/schedulesDatatableController.js
View File

@ -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;
};
}
]);

2
app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js
View File

@ -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;
};
}]);