From 8e0c1a7d7489e6d1c9ab18da01c295f7b0e27966 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <joseph.schorr@coreos.com>
Date: Mon, 26 Jan 2015 14:06:39 -0500
Subject: [PATCH] Fix restart callback

---
 static/js/app.js                   | 6 ++----
 static/js/controllers/setup.js     | 5 +++--
 static/js/controllers/superuser.js | 7 +++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/static/js/app.js b/static/js/app.js
index 380324f8d..0e40fd3e0 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -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.'))
         };
 
diff --git a/static/js/controllers/setup.js b/static/js/controllers/setup.js
index 4fe025f0e..1c814203a 100644
--- a/static/js/controllers/setup.js
+++ b/static/js/controllers/setup.js
@@ -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() {
diff --git a/static/js/controllers/superuser.js b/static/js/controllers/superuser.js
index d3bbbaab2..ee5159798 100644
--- a/static/js/controllers/superuser.js
+++ b/static/js/controllers/superuser.js
@@ -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() {