Portainer
/
portainer
mirror of https://github.com/portainer/portainer.git
1
0
Fork 0
Code Issues Packages Projects 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();
});
};
function getVolumeDataFromContainer(container, volumeId) {
return container.Mounts.find(function(volume) {
return volume.Name === volumeId;
@ -29,11 +29,8 @@ function ($scope, $state, $transition$, VolumeService, ContainerService, Notific
.then(function success(data) {
var volume = data;
$scope.volume = volume;
return ContainerService.containers(1, {
filters: {
volume: [volume.Id]
}
});
var containerFilter = { volume: [volume.Id] };
return ContainerService.containers(1, containerFilter);
})
.then(function success(data) {
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) {
var deferred = $q.defer();
filters.all = all;
Container.query(filters).$promise
Container.query({ all : all, filters: filters }).$promise
.then(function success(data) {
var containers = data.map(function (item) {
return new ContainerViewModel(item);
@ -142,7 +141,7 @@ angular.module('portainer.services')
service.containerTop = function(id) {
return Container.top({id: id}).$promise;
};
service.inspect = function(id) {
return Container.inspect({id: id}).$promise;
};