Fix restart callback

This commit is contained in:
Joseph Schorr 2015-01-26 14:06:39 -05:00
parent 0cea847f27
commit 8e0c1a7d74
3 changed files with 8 additions and 10 deletions

View file

@ -1278,11 +1278,9 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading
$provide.factory('ContainerService', ['ApiService', '$timeout',
function(ApiService, $timeout) {
var containerService = {};
containerService.restartContainer = function() {
containerService.restartContainer = function(callback) {
ApiService.scShutdownContainer(null, null).then(function(resp) {
$timeout(function() {
containerService.checkStatus();
}, 2000);
$timeout(callback, 2000);
}, ApiService.errorDisplay('Cannot restart container. Please report this to support.'))
};

View file

@ -104,8 +104,9 @@ function SetupCtrl($scope, $timeout, ApiService, Features, UserService, Containe
$scope.restartContainer = function(state) {
$scope.currentStep = state;
ContainerService.restartContainer();
$scope.checkStatus();
ContainerService.restartContainer(function() {
$scope.checkStatus()
});
};
$scope.showSuperuserPanel = function() {

View file

@ -194,10 +194,9 @@ function SuperUserAdminCtrl($scope, $timeout, ApiService, Features, UserService,
backdrop: 'static'
});
ContainerService.restartContainer();
$timeout(function() {
$scope.checkStatus();
}, 2000);
ContainerService.restartContainer(function() {
$scope.checkStatus()
});
};
$scope.checkStatus = function() {