From 730925b2866e6eb15d418471f7b82dd395d1decc Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Tue, 17 Oct 2017 10:12:16 +0200 Subject: [PATCH] fix(containers): fix an issue with filters --- app/components/volume/volumeController.js | 9 +++------ app/services/docker/containerService.js | 5 ++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/components/volume/volumeController.js b/app/components/volume/volumeController.js index ac33300de..12b7053a5 100644 --- a/app/components/volume/volumeController.js +++ b/app/components/volume/volumeController.js @@ -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) { diff --git a/app/services/docker/containerService.js b/app/services/docker/containerService.js index 4065046b0..2b09aedfa 100644 --- a/app/services/docker/containerService.js +++ b/app/services/docker/containerService.js @@ -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; };