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

feat(network): display the correct error message when a network deletion failure occurs

pull/178/head
Anthony Lapenna 2016-09-01 11:31:25 +12:00
parent 4edb4e014f
commit 6d6a7e6923
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,9 +17,15 @@ function ($scope, Network, Messages, $state, $stateParams, errorMsgFilter) {
$scope.remove = function remove(networkId) { $scope.remove = function remove(networkId) {
$('#loadingViewSpinner').show(); $('#loadingViewSpinner').show();
Network.remove({id: $stateParams.id}, function (d) { Network.remove({id: $stateParams.id}, function (d) {
$('#loadingViewSpinner').hide(); var error = errorMsgFilter(d);
Messages.send("Network removed", ""); if (error) {
$state.go('networks', {}); $('#loadingViewSpinner').hide();
Messages.send("Error", error);
} else {
$('#loadingViewSpinner').hide();
Messages.send("Network deleted", $stateParams.id);
$state.go('networks', {});
}
}, function (e) { }, function (e) {
$('#loadingViewSpinner').hide(); $('#loadingViewSpinner').hide();
Messages.error("Failure", e.data); Messages.error("Failure", e.data);

2
app/components/networks/networksController.js
View File

@ -47,7 +47,7 @@ function ($scope, $state, Network, Config, Messages, errorMsgFilter) {
Network.remove({id: network.Id}, function (d) { Network.remove({id: network.Id}, function (d) {
var error = errorMsgFilter(d); var error = errorMsgFilter(d);
if (error) { if (error) {
Messages.send("Error", "Unable to remove network with active endpoints"); Messages.send("Error", error);
} else { } else {
Messages.send("Network deleted", network.Id); Messages.send("Network deleted", network.Id);
var index = $scope.networks.indexOf(network); var index = $scope.networks.indexOf(network);