From 44e02c03421d9f40e83799c9ddd688be47f3d3b3 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Fri, 2 Sep 2016 17:59:32 +1200 Subject: [PATCH 1/2] fix(network): add missing exception management --- app/components/network/networkController.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/components/network/networkController.js b/app/components/network/networkController.js index 159a48677..8d55ce70c 100644 --- a/app/components/network/networkController.js +++ b/app/components/network/networkController.js @@ -10,7 +10,7 @@ function ($scope, Network, Messages, $state, $stateParams) { $state.go('network', {id: $stateParams.id}, {reload: true}); }, function (e) { $('#loadingViewSpinner').hide(); - Messages.error("Failure", e.data); + Messages.error("Failure", e, "Unable to disconnect container"); }); }; @@ -19,7 +19,7 @@ function ($scope, Network, Messages, $state, $stateParams) { Network.remove({id: $stateParams.id}, function (d) { if (d.message) { $('#loadingViewSpinner').hide(); - Messages.send("Error", d.message); + Messages.send("Error", {}, d.message); } else { $('#loadingViewSpinner').hide(); Messages.send("Network removed", $stateParams.id); @@ -27,11 +27,7 @@ function ($scope, Network, Messages, $state, $stateParams) { } }, function (e) { $('#loadingViewSpinner').hide(); - if (e.data.message) { - Messages.error("Failure", e.data.message); - } else { - Messages.error("Failure", 'Unable to remove network'); - } + Messages.error("Failure", e, "Unable to remove network"); }); }; @@ -40,7 +36,7 @@ function ($scope, Network, Messages, $state, $stateParams) { $scope.network = d; $('#loadingViewSpinner').hide(); }, function (e) { - Messages.error("Failure", e.data); $('#loadingViewSpinner').hide(); + Messages.error("Failure", e, "Unable to retrieve network info"); }); }]); From 6eb1cff8c50a8d157dd74591507265bb964cc59a Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Sun, 4 Sep 2016 12:04:42 +1200 Subject: [PATCH 2/2] docs(version): update Docker versions support section --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b1fde07f4..a2cb30d84 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,10 @@ UI For Docker is a web interface for the Docker Remote API. The goal is to prov ## Supported Docker versions -The current Docker version support policy is the following: `N` to `N-2` included where `N` is the latest version. +The following Docker versions are supported: -At the moment, the following versions are supported: 1.9, 1.10 & 1.11. +* full support for Docker 1.10, 1.11 and 1.12 +* partial support for Docker 1.9 (some features won't be available) ## Run