vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix restart callback

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
static/js/app.js
View file

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

5
static/js/controllers/setup.js
View file

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

7
static/js/controllers/superuser.js
View file

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