diff --git a/webadmin/js/setup.js b/webadmin/js/setup.js index d5e3b5b7d..ae74d1a8c 100644 --- a/webadmin/js/setup.js +++ b/webadmin/js/setup.js @@ -1,6 +1,7 @@ 'use strict'; var SetupController = function ($scope, Client) { + $scope.initialized = false; $scope.disabled = false; $scope.username = ''; @@ -12,14 +13,11 @@ var SetupController = function ($scope, Client) { $scope.error = {}; $scope.submit = function () { - console.debug('Try to create admin %s.', $scope.username); - $scope.error.name = null; $scope.error.password = null; $scope.error.passwordRepeat = null; if (!$scope.username) { - console.error('Username must not be empty'); $scope.error.name = 'Username must not be empty'; $scope.error.password = ''; $scope.error.passwordRepeat = ''; @@ -27,7 +25,6 @@ var SetupController = function ($scope, Client) { } if ($scope.password !== $scope.passwordRepeat) { - console.error('Passwords dont match.'); $scope.error.name = ''; $scope.error.passwordRepeat = 'Passwords do not match'; $scope.passwordRepeat = ''; @@ -35,9 +32,8 @@ var SetupController = function ($scope, Client) { } $scope.disabled = true; - Client.createAdmin($scope.username, $scope.password, $scope.email, function (error, result) { + Client.createAdmin($scope.username, $scope.password, $scope.email, function (error) { if (error) { - console.error('Unable to create user.', error); if (error.statusCode === 409) { $scope.error.name = 'Username already exists'; $scope.disabled = false; @@ -45,21 +41,19 @@ var SetupController = function ($scope, Client) { return; } - console.debug('Successfully create user', $scope.username); window.location.href = '/'; }); }; Client.setClientCredentials('cid-webadmin', 'unused'); Client.isServerFirstTime(function (error, isFirstTime) { - if (error) { - console.error('Unable to connect.', error); - return; - } + if (error) return; if (!isFirstTime) { window.location.href = '/'; return; } + + $scope.initialized = true; }); }; diff --git a/webadmin/setup.html b/webadmin/setup.html index d93d9c12b..3e1243fca 100644 --- a/webadmin/setup.html +++ b/webadmin/setup.html @@ -4,36 +4,49 @@ - YellowTent + YellowTent - - + + - - + + - - + + - - + + - - + + - - + + + + + -
+