From 27dcd708a6c1af5e35634edb5beb49c951aec612 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Sun, 18 Mar 2018 07:09:07 +1000 Subject: [PATCH] fix(extensions): init endpoint extensions after admin user creation (#1733) * fix(extensions): init endpoint extensions after admin user creation --- .../views/init/admin/initAdminController.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/portainer/views/init/admin/initAdminController.js b/app/portainer/views/init/admin/initAdminController.js index f89bdddca..103862b0a 100644 --- a/app/portainer/views/init/admin/initAdminController.js +++ b/app/portainer/views/init/admin/initAdminController.js @@ -1,6 +1,6 @@ angular.module('portainer.app') -.controller('InitAdminController', ['$scope', '$state', '$sanitize', 'Notifications', 'Authentication', 'StateManager', 'UserService', 'EndpointService', 'EndpointProvider', -function ($scope, $state, $sanitize, Notifications, Authentication, StateManager, UserService, EndpointService, EndpointProvider) { +.controller('InitAdminController', ['$scope', '$state', '$sanitize', 'Notifications', 'Authentication', 'StateManager', 'UserService', 'EndpointService', 'EndpointProvider', 'ExtensionManager', +function ($scope, $state, $sanitize, Notifications, Authentication, StateManager, UserService, EndpointService, EndpointProvider, ExtensionManager) { $scope.logo = StateManager.getState().application.logo; @@ -31,8 +31,13 @@ function ($scope, $state, $sanitize, Notifications, Authentication, StateManager $state.go('portainer.init.endpoint'); } else { var endpoint = data[0]; - EndpointProvider.setEndpointID(endpoint.Id); - StateManager.updateEndpointState(false, endpoint.Extensions) + endpointID = endpoint.Id; + EndpointProvider.setEndpointID(endpointID); + ExtensionManager.initEndpointExtensions(endpointID) + .then(function success(data) { + var extensions = data; + return StateManager.updateEndpointState(false, extensions); + }) .then(function success() { $state.go('docker.dashboard'); })