Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 15:59:41 +02:00
Code Issues Releases Activity

merge fix-viewspinner

Browse source
This commit is contained in:
Anthony Lapenna 2016-07-07 13:15:56 +12:00
commit fd6645d068
19 changed files with 112 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/components/createContainer/createContainerController.js
View file

@ -1,6 +1,6 @@
angular.module('createContainer', [])
.controller('CreateContainerController', ['$scope', '$state', 'Config', 'Container', 'Image', 'Volume', 'Network', 'Messages', 'ViewSpinner', 'errorMsgFilter',
function ($scope, $state, Config, Container, Image, Volume, Network, Messages, ViewSpinner, errorMsgFilter) {
.controller('CreateContainerController', ['$scope', '$state', 'Config', 'Container', 'Image', 'Volume', 'Network', 'Messages', 'errorMsgFilter',
function ($scope, $state, Config, Container, Image, Volume, Network, Messages, errorMsgFilter) {
$scope.state = {
alwaysPull: true
@ -82,25 +82,25 @@ function ($scope, $state, Config, Container, Image, Volume, Network, Messages, V
});
function createContainer(config) {
ViewSpinner.spin();
$('#createContainerSpinner').show();
Container.create(config, function (d) {
if (d.Id) {
var reqBody = config.HostConfig || {};
reqBody.id = d.Id;
Container.start(reqBody, function (cd) {
ViewSpinner.stop();
$('#createContainerSpinner').hide();
Messages.send('Container Started', d.Id);
$state.go('containers', {}, {reload: true});
}, function (e) {
ViewSpinner.stop();
$('#createContainerSpinner').hide();
Messages.error('Error', errorMsgFilter(e));
});
} else {
ViewSpinner.stop();
$('#createContainerSpinner').hide();
Messages.error('Error', errorMsgFilter(d));
}
}, function (e) {
ViewSpinner.stop();
$('#createContainerSpinner').hide();
Messages.error('Error', errorMsgFilter(e));
});
}
@ -115,7 +115,7 @@ function ($scope, $state, Config, Container, Image, Volume, Network, Messages, V
}
function pullImageAndCreateContainer(config) {
ViewSpinner.spin();
$('#createContainerSpinner').show();
var image = _.toLower(config.Image);
var imageConfig = createImageConfig(image);
@ -124,13 +124,13 @@ function ($scope, $state, Config, Container, Image, Volume, Network, Messages, V
var err = data.length > 0 && data[data.length - 1].hasOwnProperty('error');
if (err) {
var detail = data[data.length - 1];
ViewSpinner.stop();
$('#createContainerSpinner').hide();
Messages.error('Error', detail.error);
} else {
createContainer(config);
}
}, function (e) {
ViewSpinner.stop();
$('#createContainerSpinner').hide();
Messages.error('Error', 'Unable to pull image ' + image);
});
}

3
app/components/createContainer/createcontainer.html
View file

@ -305,6 +305,9 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-xs-12" style="text-align: center;">
<div>
<i id="createContainerSpinner" class="fa fa-cog fa-3x fa-spin" style="margin-bottom: 5px; display: none;"></i>
</div>
<button type="button" class="btn btn-default btn-lg" ng-click="create()">Create</button>
<a type="button" class="btn btn-default btn-lg" ui-sref="containers">Cancel</a>
</div>