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

Merge branch 'feat95-remove-errormsgfilter' into internal

Browse Source
This commit is contained in:
Anthony Lapenna
2016-09-02 15:32:20 +12:00
parent 3aabf7bdb7 9698aa7ad5
commit 334d91ebe8
12 changed files with 141 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/components/createContainer/createContainerController.js
+24 -11
View File
@@ -1,6 +1,6 @@
angular.module('createContainer', [])
.controller('CreateContainerController', ['$scope', '$state', 'Config', 'Container', 'Image', 'Volume', 'Network', 'Messages', 'errorMsgFilter',
function ($scope, $state, Config, Container, Image, Volume, Network, Messages, errorMsgFilter) {
.controller('CreateContainerController', ['$scope', '$state', 'Config', 'Container', 'Image', 'Volume', 'Network', 'Messages',
function ($scope, $state, Config, Container, Image, Volume, Network, Messages) {
$scope.state = {
alwaysPull: true
@@ -91,22 +91,35 @@ function ($scope, $state, Config, Container, Image, Volume, Network, Messages, e
// TODO: centralize, already present in templatesController
function createContainer(config) {
Container.create(config, function (d) {
if (d.Id) {
if (d.message) {
$('#createContainerSpinner').hide();
Messages.error('Error', d.message);
} else {
Container.start({id: d.Id}, {}, function (cd) {
$('#createContainerSpinner').hide();
Messages.send('Container Started', d.Id);
$state.go('containers', {}, {reload: true});
if (cd.message) {
$('#createContainerSpinner').hide();
Messages.error('Error', cd.message);
} else {
$('#createContainerSpinner').hide();
Messages.send('Container Started', d.Id);
$state.go('containers', {}, {reload: true});
}
}, function (e) {
$('#createContainerSpinner').hide();
Messages.error('Error', errorMsgFilter(e));
if (e.data.message) {
Messages.error("Failure", e.data.message);
} else {
Messages.error("Failure", 'Unable to start container');
}
});
} else {
$('#createContainerSpinner').hide();
Messages.error('Error', errorMsgFilter(d));
}
}, function (e) {
$('#createContainerSpinner').hide();
Messages.error('Error', errorMsgFilter(e));
if (e.data.message) {
Messages.error("Failure", e.data.message);
} else {
Messages.error("Failure", 'Unable to create container');
}
});
}