Merge pull request #9 from crosbymichael/master

Pull latest changes
pull/2/head
Kevan Ahlquist 10 years ago
commit c798a95fb3

@ -26,6 +26,29 @@ function($scope, Container, Settings, Messages, ViewSpinner) {
};
angular.forEach(items, function(c) {
if (c.Checked) {
if(action === Container.start){
Container.get({id: c.Id}, function(d) {
c = d;
counter = counter + 1;
action({id: c.Id, HostConfig: c.HostConfig || {}}, function(d) {
Messages.send("Container " + msg, c.Id);
var index = $scope.containers.indexOf(c);
complete();
}, function(e) {
Messages.error("Failure", e.data);
complete();
});
}, function(e) {
if (e.status === 404) {
$('.detail').hide();
Messages.error("Not found", "Container not found.");
} else {
Messages.error("Failure", e.data);
}
complete();
});
}
else{
counter = counter + 1;
action({id: c.Id}, function(d) {
Messages.send("Container " + msg, c.Id);
@ -35,6 +58,9 @@ function($scope, Container, Settings, Messages, ViewSpinner) {
Messages.error("Failure", e.data);
complete();
});
}
}
});
if (counter === 0) {

28
dist/dockerui.js vendored

@ -1,4 +1,4 @@
/*! dockerui - v0.6.0 - 2015-02-01
/*! dockerui - v0.6.0 - 2015-02-09
* https://github.com/crosbymichael/dockerui
* Copyright (c) 2015 Michael Crosby & Kevan Ahlquist;
* Licensed MIT
@ -211,6 +211,29 @@ function($scope, Container, Settings, Messages, ViewSpinner) {
};
angular.forEach(items, function(c) {
if (c.Checked) {
if(action === Container.start){
Container.get({id: c.Id}, function(d) {
c = d;
counter = counter + 1;
action({id: c.Id, HostConfig: c.HostConfig || {}}, function(d) {
Messages.send("Container " + msg, c.Id);
var index = $scope.containers.indexOf(c);
complete();
}, function(e) {
Messages.error("Failure", e.data);
complete();
});
}, function(e) {
if (e.status === 404) {
$('.detail').hide();
Messages.error("Not found", "Container not found.");
} else {
Messages.error("Failure", e.data);
}
complete();
});
}
else{
counter = counter + 1;
action({id: c.Id}, function(d) {
Messages.send("Container " + msg, c.Id);
@ -220,6 +243,9 @@ function($scope, Container, Settings, Messages, ViewSpinner) {
Messages.error("Failure", e.data);
complete();
});
}
}
});
if (counter === 0) {

Loading…
Cancel
Save