vvzvlad/portainer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feat95-exception-mgmt' into internal

Browse Source
This commit is contained in:
Anthony Lapenna
2016-09-02 17:58:03 +12:00
parent 334d91ebe8 67194109c6
commit 4192920537
14 changed files with 75 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/components/createContainer/createContainerController.js
+8 -16
View File
@@ -66,7 +66,7 @@ function ($scope, $state, Config, Container, Image, Volume, Network, Messages) {
});
$scope.availableVolumes = _.uniqBy(persistedVolumes, 'Name');
}, function (e) {
Messages.error("Failure", e.data);
Messages.error("Failure", e, "Unable to retrieve volumes");
});
Network.query({}, function (d) {
@@ -84,7 +84,7 @@ function ($scope, $state, Config, Container, Image, Volume, Network, Messages) {
}
$scope.availableNetworks = networks;
}, function (e) {
Messages.error("Failure", e.data);
Messages.error("Failure", e, "Unable to retrieve networks");
});
});
@@ -93,12 +93,12 @@ function ($scope, $state, Config, Container, Image, Volume, Network, Messages) {
Container.create(config, function (d) {
if (d.message) {
$('#createContainerSpinner').hide();
Messages.error('Error', d.message);
Messages.error('Error', {}, d.message);
} else {
Container.start({id: d.Id}, {}, function (cd) {
if (cd.message) {
$('#createContainerSpinner').hide();
Messages.error('Error', cd.message);
Messages.error('Error', {}, cd.message);
} else {
$('#createContainerSpinner').hide();
Messages.send('Container Started', d.Id);
@@ -106,20 +106,12 @@ function ($scope, $state, Config, Container, Image, Volume, Network, Messages) {
}
}, function (e) {
$('#createContainerSpinner').hide();
if (e.data.message) {
Messages.error("Failure", e.data.message);
} else {
Messages.error("Failure", 'Unable to start container');
}
Messages.error("Failure", e, 'Unable to start container');
});
}
}, function (e) {
$('#createContainerSpinner').hide();
if (e.data.message) {
Messages.error("Failure", e.data.message);
} else {
Messages.error("Failure", 'Unable to create container');
}
Messages.error("Failure", e, 'Unable to create container');
});
}
@@ -130,13 +122,13 @@ function ($scope, $state, Config, Container, Image, Volume, Network, Messages) {
if (err) {
var detail = data[data.length - 1];
$('#createContainerSpinner').hide();
Messages.error('Error', detail.error);
Messages.error('Error', {}, detail.error);
} else {
createContainer(config);
}
}, function (e) {
$('#createContainerSpinner').hide();
Messages.error('Error', 'Unable to pull image ' + image);
Messages.error('Failure', e, 'Unable to pull image');
});
}