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

dockerui-118 How to pull images / create container from repo image ? 

-Fixed ViewSpinner variable.
-Hide the modal on submit, show Spinner and show again modal if needed (in case of error)
-Clear modal values after successful pull
pull/2/head
Haris Michopoulos 2015-06-22 23:30:16 +02:00
parent 5dd094e0b1
commit 394f2f2387
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/components/pullImage/pullImageController.js
View File

@ -1,15 +1,19 @@
angular.module('pullImage', []) angular.module('pullImage', [])
.controller('PullImageController', ['$scope', '$log', 'Dockerfile', 'Messages', 'Image', 'ViewSpinner', .controller('PullImageController', ['$scope', '$log', 'Dockerfile', 'Messages', 'Image', 'ViewSpinner',
function($scope, $log, Dockerfile, Messages, Image, ViewSpinne) { function($scope, $log, Dockerfile, Messages, Image, ViewSpinner) {
$scope.template = 'app/components/pullImage/pullImage.html'; $scope.template = 'app/components/pullImage/pullImage.html';
$scope.config = { $scope.init = function() {
registry: '', $scope.config = {
repo: '', registry: '',
fromImage: '', repo: '',
tag: 'latest' fromImage: '',
tag: 'latest'
}
} }
$scope.init();
function failedRequestHandler(e, Messages) { function failedRequestHandler(e, Messages) {
Messages.error('Error', errorMsgFilter(e)); Messages.error('Error', errorMsgFilter(e));
} }
@ -23,6 +27,7 @@ angular.module('pullImage', [])
(config.tag ? ':' + config.tag : ''); (config.tag ? ':' + config.tag : '');
ViewSpinner.spin(); ViewSpinner.spin();
$('#pull-modal').modal('hide');
Image.create(config, function(data) { Image.create(config, function(data) {
ViewSpinner.stop(); ViewSpinner.stop();
if (data.constructor === Array) { if (data.constructor === Array) {
@ -31,18 +36,20 @@ angular.module('pullImage', [])
if (f) { if (f) {
var d = data[data.length - 1]; var d = data[data.length - 1];
$scope.error = "Cannot pull image " + imageName + " Reason: " + d.error; $scope.error = "Cannot pull image " + imageName + " Reason: " + d.error;
$('#pull-modal').modal('show');
$('#error-message').show(); $('#error-message').show();
} else { } else {
Messages.send("Image Added", imageName); Messages.send("Image Added", imageName);
$('#pull-modal').modal('hide'); $scope.init();
} }
} else { } else {
Messages.send("Image Added", imageName); Messages.send("Image Added", imageName);
$('#pull-modal').modal('hide'); $scope.init();
} }
}, function(e) { }, function(e) {
ViewSpinner.stop(); ViewSpinner.stop();
$scope.error = "Cannot pull image " + imageName + " Reason: " + e.data; $scope.error = "Cannot pull image " + imageName + " Reason: " + e.data;
$('#pull-modal').modal('show');
$('#error-message').show(); $('#error-message').show();
}); });
} }