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

fix(network-details): fix an issue caused by stopped containers (#1328)

pull/1309/head
Anthony Lapenna 2017-10-25 13:37:52 +02:00 committed by GitHub
parent 711128284e
commit 25f325bbaa
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/components/network/networkController.js
View File

@ -40,12 +40,14 @@ function ($scope, $state, $transition$, $filter, Network, NetworkService, Contai
var containersInNetwork = []; var containersInNetwork = [];
containers.forEach(function(container) { containers.forEach(function(container) {
var containerInNetwork = network.Containers[container.Id]; var containerInNetwork = network.Containers[container.Id];
if (containerInNetwork) {
containerInNetwork.Id = container.Id; containerInNetwork.Id = container.Id;
// Name is not available in Docker 1.9 // Name is not available in Docker 1.9
if (!containerInNetwork.Name) { if (!containerInNetwork.Name) {
containerInNetwork.Name = $filter('trimcontainername')(container.Names[0]); containerInNetwork.Name = $filter('trimcontainername')(container.Names[0]);
} }
containersInNetwork.push(containerInNetwork); containersInNetwork.push(containerInNetwork);
}
}); });
$scope.containersInNetwork = containersInNetwork; $scope.containersInNetwork = containersInNetwork;
} }
@ -68,7 +70,7 @@ function ($scope, $state, $transition$, $filter, Network, NetworkService, Contai
}); });
} else { } else {
Container.query({ Container.query({
filters: {network: [$transition$.params().id]} filters: { network: [$transition$.params().id] }
}, function success(data) { }, function success(data) {
filterContainersInNetwork(network, data); filterContainersInNetwork(network, data);
$('#loadingViewSpinner').hide(); $('#loadingViewSpinner').hide();