diff --git a/app/components/containers/containers.html b/app/components/containers/containers.html
index 1e13ffac3..6369dcc37 100644
--- a/app/components/containers/containers.html
+++ b/app/components/containers/containers.html
@@ -98,6 +98,9 @@
-
+
+ Loading... |
+
No containers available. |
diff --git a/app/components/containers/containersController.js b/app/components/containers/containersController.js
index bbbe506d0..caef7c94b 100644
--- a/app/components/containers/containersController.js
+++ b/app/components/containers/containersController.js
@@ -8,7 +8,6 @@ function ($scope, Container, ContainerHelper, Info, Settings, Messages, Config)
$scope.sortReverse = false;
$scope.state.selectedItemCount = 0;
$scope.swarm_mode = false;
- $scope.containers = [];
$scope.order = function (sortType) {
$scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false;
@@ -34,6 +33,10 @@ function ($scope, Container, ContainerHelper, Info, Settings, Messages, Config)
return model;
});
$('#loadContainersSpinner').hide();
+ }, function (e) {
+ $('#loadContainersSpinner').hide();
+ Messages.error("Failure", e, "Unable to retrieve containers");
+ $scope.containers = [];
});
};
diff --git a/app/components/images/images.html b/app/components/images/images.html
index 1405432c0..cad9b590b 100644
--- a/app/components/images/images.html
+++ b/app/components/images/images.html
@@ -107,6 +107,9 @@
{{ image.VirtualSize|humansize }} |
{{ image.Created|getisodatefromtimestamp }} |
+
+ Loading... |
+
No images available. |
diff --git a/app/components/images/imagesController.js b/app/components/images/imagesController.js
index 76ff6e29d..0d17817c4 100644
--- a/app/components/images/imagesController.js
+++ b/app/components/images/imagesController.js
@@ -5,7 +5,6 @@ function ($scope, $state, Config, Image, Messages) {
$scope.sortType = 'RepoTags';
$scope.sortReverse = true;
$scope.state.selectedItemCount = 0;
- $scope.images = [];
$scope.config = {
Image: '',
@@ -98,6 +97,7 @@ function ($scope, $state, Config, Image, Messages) {
}, function (e) {
$('#loadImagesSpinner').hide();
Messages.error("Failure", e, "Unable to retrieve images");
+ $scope.images = [];
});
}
diff --git a/app/components/networks/networks.html b/app/components/networks/networks.html
index 20ebf0f5b..6d75df9c5 100644
--- a/app/components/networks/networks.html
+++ b/app/components/networks/networks.html
@@ -131,6 +131,9 @@
{{ network.IPAM.Config[0].Subnet ? network.IPAM.Config[0].Subnet : '-' }} |
{{ network.IPAM.Config[0].Gateway ? network.IPAM.Config[0].Gateway : '-' }} |
+
+ Loading... |
+
No networks available. |
diff --git a/app/components/networks/networksController.js b/app/components/networks/networksController.js
index 818f4f58b..4178cd047 100644
--- a/app/components/networks/networksController.js
+++ b/app/components/networks/networksController.js
@@ -6,8 +6,6 @@ function ($scope, $state, Network, Config, Messages) {
$scope.state.advancedSettings = false;
$scope.sortType = 'Name';
$scope.sortReverse = false;
- $scope.networks = [];
-
$scope.config = {
Name: ''
};
@@ -93,6 +91,7 @@ function ($scope, $state, Network, Config, Messages) {
}, function (e) {
$('#loadNetworksSpinner').hide();
Messages.error("Failure", e, "Unable to retrieve networks");
+ $scope.networks = [];
});
}
diff --git a/app/components/services/services.html b/app/components/services/services.html
index 8cc618a28..ede13aabd 100644
--- a/app/components/services/services.html
+++ b/app/components/services/services.html
@@ -69,6 +69,12 @@
+
+ Loading... |
+
+
+ No services available. |
+
diff --git a/app/components/services/servicesController.js b/app/components/services/servicesController.js
index ac7054e01..52ff25a86 100644
--- a/app/components/services/servicesController.js
+++ b/app/components/services/servicesController.js
@@ -1,8 +1,6 @@
angular.module('services', [])
.controller('ServicesController', ['$scope', '$stateParams', '$state', 'Service', 'ServiceHelper', 'Messages',
function ($scope, $stateParams, $state, Service, ServiceHelper, Messages) {
-
- $scope.services = [];
$scope.state = {};
$scope.state.selectedItemCount = 0;
$scope.sortType = 'Name';
@@ -77,6 +75,7 @@ function ($scope, $stateParams, $state, Service, ServiceHelper, Messages) {
}, function(e) {
$('#loadServicesSpinner').hide();
Messages.error("Failure", e, "Unable to retrieve services");
+ $scope.services = [];
});
}
diff --git a/app/components/volumes/volumes.html b/app/components/volumes/volumes.html
index 4c3ae2072..88791d2ac 100644
--- a/app/components/volumes/volumes.html
+++ b/app/components/volumes/volumes.html
@@ -59,6 +59,9 @@
{{ volume.Driver }} |
{{ volume.Mountpoint }} |
+
+ Loading... |
+
No volumes available. |
diff --git a/app/components/volumes/volumesController.js b/app/components/volumes/volumesController.js
index fc0dc8888..202b0835b 100644
--- a/app/components/volumes/volumesController.js
+++ b/app/components/volumes/volumesController.js
@@ -5,8 +5,6 @@ function ($scope, $state, Volume, Messages) {
$scope.state.selectedItemCount = 0;
$scope.sortType = 'Name';
$scope.sortReverse = true;
- $scope.volumes = [];
-
$scope.config = {
Name: ''
};
@@ -61,6 +59,7 @@ function ($scope, $state, Volume, Messages) {
}, function (e) {
$('#loadVolumesSpinner').hide();
Messages.error("Failure", e, "Unable to retrieve volumes");
+ $scope.volumes = [];
});
}
fetchVolumes();