github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(admin-init): do not redirect to endpoint-init if at least one endpoint is defined

pull/1187/head
Anthony Lapenna 2017-09-11 10:36:18 +02:00
parent 56604a5445
commit be4f3ec81d
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/components/initAdmin/initAdminController.js
View File

@ -1,6 +1,6 @@
angular.module('initAdmin', []) angular.module('initAdmin', [])
.controller('InitAdminController', ['$scope', '$state', '$sanitize', 'Notifications', 'Authentication', 'StateManager', 'UserService', .controller('InitAdminController', ['$scope', '$state', '$sanitize', 'Notifications', 'Authentication', 'StateManager', 'UserService', 'EndpointService', 'EndpointProvider',
function ($scope, $state, $sanitize, Notifications, Authentication, StateManager, UserService) { function ($scope, $state, $sanitize, Notifications, Authentication, StateManager, UserService, EndpointService, EndpointProvider) {
$scope.logo = StateManager.getState().application.logo; $scope.logo = StateManager.getState().application.logo;
@ -20,7 +20,23 @@ function ($scope, $state, $sanitize, Notifications, Authentication, StateManager
return Authentication.login(username, password); return Authentication.login(username, password);
}) })
.then(function success() { .then(function success() {
$state.go('init.endpoint'); return EndpointService.endpoints();
})
.then(function success(data) {
var endpoints = data;
if (endpoints.length > 0) {
var endpoint = endpoints[0];
EndpointProvider.setEndpointID(endpoint.Id);
StateManager.updateEndpointState(true)
.then(function success(data) {
$state.go('dashboard');
})
.catch(function error(err) {
Notifications.error('Failure', err, 'Unable to connect to the Docker endpoint');
});
} else {
$state.go('init.endpoint');
}
}) })
.catch(function error(err) { .catch(function error(err) {
Notifications.error('Failure', err, 'Unable to create administrator user'); Notifications.error('Failure', err, 'Unable to create administrator user');