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

fix(containers): fix an issue with filters

pull/1289/merge
Anthony Lapenna 2017-10-17 10:12:16 +02:00
parent 7eaaf9a2a7
commit 730925b286
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/components/volume/volumeController.js
View File

@ -16,7 +16,7 @@ function ($scope, $state, $transition$, VolumeService, ContainerService, Notific
$('#loadingViewSpinner').hide(); $('#loadingViewSpinner').hide();
}); });
}; };
function getVolumeDataFromContainer(container, volumeId) { function getVolumeDataFromContainer(container, volumeId) {
return container.Mounts.find(function(volume) { return container.Mounts.find(function(volume) {
return volume.Name === volumeId; return volume.Name === volumeId;
@ -29,11 +29,8 @@ function ($scope, $state, $transition$, VolumeService, ContainerService, Notific
.then(function success(data) { .then(function success(data) {
var volume = data; var volume = data;
$scope.volume = volume; $scope.volume = volume;
return ContainerService.containers(1, { var containerFilter = { volume: [volume.Id] };
filters: { return ContainerService.containers(1, containerFilter);
volume: [volume.Id]
}
});
}) })
.then(function success(data) { .then(function success(data) {
var containers = data.map(function(container) { var containers = data.map(function(container) {

5
app/services/docker/containerService.js
View File

@ -20,8 +20,7 @@ angular.module('portainer.services')
service.containers = function(all, filters) { service.containers = function(all, filters) {
var deferred = $q.defer(); var deferred = $q.defer();
filters.all = all; Container.query({ all : all, filters: filters }).$promise
Container.query(filters).$promise
.then(function success(data) { .then(function success(data) {
var containers = data.map(function (item) { var containers = data.map(function (item) {
return new ContainerViewModel(item); return new ContainerViewModel(item);
@ -142,7 +141,7 @@ angular.module('portainer.services')
service.containerTop = function(id) { service.containerTop = function(id) {
return Container.top({id: id}).$promise; return Container.top({id: id}).$promise;
}; };
service.inspect = function(id) { service.inspect = function(id) {
return Container.inspect({id: id}).$promise; return Container.inspect({id: id}).$promise;
}; };