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

feat(containers): do not remember selected items (#1988)

pull/2000/head
Anthony Lapenna 2018-06-21 13:09:57 +02:00 committed by GitHub
parent d3a26a4ade
commit 0a9eab53d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/docker/components/datatables/containers-datatable/containersDatatable.html
View File

@ -178,7 +178,7 @@
<td>{{ item.IP ? item.IP : '-' }}</td> <td>{{ item.IP ? item.IP : '-' }}</td>
<td ng-if="$ctrl.showHostColumn">{{ item.NodeName ? item.NodeName : '-' }}</td> <td ng-if="$ctrl.showHostColumn">{{ item.NodeName ? item.NodeName : '-' }}</td>
<td> <td>
<a ng-if="item.Ports.length > 0" ng-repeat="p in item.Ports" class="image-tag" ng-href="http://{{ $ctrl.state.publicUrl || p.host }}:{{p.public}}" target="_blank"> <a ng-if="item.Ports.length > 0" ng-repeat="p in item.Ports" class="image-tag" ng-href="http://{{ $ctrl.state.publicURL || p.host }}:{{p.public}}" target="_blank">
<i class="fa fa-external-link-alt" aria-hidden="true"></i> {{ p.public }}:{{ p.private }} <i class="fa fa-external-link-alt" aria-hidden="true"></i> {{ p.public }}:{{ p.private }}
</a> </a>
<span ng-if="item.Ports.length == 0" >-</span> <span ng-if="item.Ports.length == 0" >-</span>

31
app/docker/components/datatables/containers-datatable/containersDatatableController.js
View File

@ -1,7 +1,6 @@
angular.module('portainer.docker') angular.module('portainer.docker')
.controller('ContainersDatatableController', ['PaginationService', 'DatatableService', 'EndpointProvider', .controller('ContainersDatatableController', ['PaginationService', 'DatatableService', 'EndpointProvider',
function (PaginationService, DatatableService, EndpointProvider) { function (PaginationService, DatatableService, EndpointProvider) {
var ctrl = this; var ctrl = this;
this.state = { this.state = {
@ -49,7 +48,6 @@ function (PaginationService, DatatableService, EndpointProvider) {
this.state.selectedItems.splice(this.state.selectedItems.indexOf(item), 1); this.state.selectedItems.splice(this.state.selectedItems.indexOf(item), 1);
this.state.selectedItemCount--; this.state.selectedItemCount--;
} }
DatatableService.setDataTableSelectedItems(this.tableKey + '_' + EndpointProvider.endpointID(), this.state.selectedItems);
}; };
this.selectItem = function(item) { this.selectItem = function(item) {
@ -162,30 +160,6 @@ function (PaginationService, DatatableService, EndpointProvider) {
} }
}; };
function selectPreviouslySelectedItem(item, storedSelectedItems) {
var selectedItem = _.find(storedSelectedItems, function(container) {
return item.Id === container.Id;
});
if (selectedItem) {
item.Checked = true;
ctrl.state.selectedItemCount++;
ctrl.state.selectedItems.push(item);
}
}
this.selectItems = function(storedSelectedItems) {
for (var i = 0; i < this.dataset.length; i++) {
var item = this.dataset[i];
selectPreviouslySelectedItem(item, storedSelectedItems);
}
if (this.state.selectedItemCount > 0 && this.state.selectedItemCount === this.dataset.length) {
this.state.selectAll = true;
}
this.updateSelectionState();
};
this.$onInit = function() { this.$onInit = function() {
setDefaults(this); setDefaults(this);
this.prepareTableFromDataset(); this.prepareTableFromDataset();
@ -196,11 +170,6 @@ function (PaginationService, DatatableService, EndpointProvider) {
this.state.orderBy = storedOrder.orderBy; this.state.orderBy = storedOrder.orderBy;
} }
var storedSelectedItems = DatatableService.getDataTableSelectedItems(this.tableKey + '_' + EndpointProvider.endpointID());
if (storedSelectedItems !== null) {
this.selectItems(storedSelectedItems);
}
var storedFilters = DatatableService.getDataTableFilters(this.tableKey); var storedFilters = DatatableService.getDataTableFilters(this.tableKey);
if (storedFilters !== null) { if (storedFilters !== null) {
this.updateStoredFilters(storedFilters.state.values); this.updateStoredFilters(storedFilters.state.values);