Make restore work without a domain

Fixes #195
2017-01-23 12:22:02 -08:00
parent 9ab34ee43a
commit 75b60a2949
2 changed files with 7 additions and 6 deletions
--- a/webadmin/src/js/setup.js
+++ b/webadmin/src/js/setup.js
@@ -66,17 +66,17 @@ app.controller('SetupController', ['$scope', '$http', 'Client', function ($scope
            return;
        }

-        if (status.activated) {
-            window.location.href = '/';
-            return;
-        }
-
        // if we don't have a domain yet, first go to domain setup
        if (!status.adminFqdn) {
            window.location.href = '/setupdns.html';
            return;
        }

+        if (status.activated) {
+            window.location.href = '/';
+            return;
+        }
+
        if (status.provider === 'caas') {
            if (!search.setupToken) {
                window.location.href = '/error.html?errorCode=2';