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

Merge pull request #205 from cloud-inovasi/fix185-volume-deletion-error 

fix(volumes): display an error message when trying to delete a bound …
pull/206/head
Anthony Lapenna 2016-09-07 18:23:11 +12:00 committed by GitHub
parent 1cd620a45e ca5cf33c8f
commit 857c93bff9
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/components/volumes/volumesController.js
View File

@ -36,9 +36,13 @@ function ($scope, $state, Volume, Messages) {
if (volume.Checked) { if (volume.Checked) {
counter = counter + 1; counter = counter + 1;
Volume.remove({name: volume.Name}, function (d) { Volume.remove({name: volume.Name}, function (d) {
Messages.send("Volume deleted", volume.Name); if (d.message) {
var index = $scope.volumes.indexOf(volume); Messages.error("Unable to remove volume", {}, d.message);
$scope.volumes.splice(index, 1); } else {
Messages.send("Volume deleted", volume.Name);
var index = $scope.volumes.indexOf(volume);
$scope.volumes.splice(index, 1);
}
complete(); complete();
}, function (e) { }, function (e) {
Messages.error("Failure", e, "Unable to remove volume"); Messages.error("Failure", e, "Unable to remove volume");

6
app/shared/services.js
View File

@ -165,7 +165,9 @@ angular.module('portainer.services', ['ngResource', 'ngSanitize'])
query: {method: 'GET'}, query: {method: 'GET'},
get: {method: 'GET'}, get: {method: 'GET'},
create: {method: 'POST', params: {action: 'create'}, transformResponse: genericHandler}, create: {method: 'POST', params: {action: 'create'}, transformResponse: genericHandler},
remove: {method: 'DELETE'} remove: {
method: 'DELETE', transformResponse: genericHandler
}
}); });
}]) }])
.factory('Config', ['$resource', 'CONFIG_ENDPOINT', function ConfigFactory($resource, CONFIG_ENDPOINT) { .factory('Config', ['$resource', 'CONFIG_ENDPOINT', function ConfigFactory($resource, CONFIG_ENDPOINT) {
@ -212,7 +214,7 @@ angular.module('portainer.services', ['ngResource', 'ngSanitize'])
msg = e.data.message; msg = e.data.message;
} else if (e.message) { } else if (e.message) {
msg = e.message; msg = e.message;
} else if (e.data.length > 0 && e.data[0].message) { } else if (e.data && e.data.length > 0 && e.data[0].message) {
msg = e.data[0].message; msg = e.data[0].message;
} }
$.gritter.add({ $.gritter.add({