From 8ad579b90b7f219085f5b66a0643e65351476df6 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Fri, 2 Mar 2018 21:45:21 -0500 Subject: [PATCH] GUACAMOLE-508: Use object instead of array for multiple promises. --- .../main/webapp/app/navigation/services/userPageService.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/guacamole/src/main/webapp/app/navigation/services/userPageService.js b/guacamole/src/main/webapp/app/navigation/services/userPageService.js index 6100237f0..b9144a6a8 100644 --- a/guacamole/src/main/webapp/app/navigation/services/userPageService.js +++ b/guacamole/src/main/webapp/app/navigation/services/userPageService.js @@ -163,9 +163,12 @@ angular.module('navigation').factory('userPageService', ['$injector', authenticationService.getCurrentUsername() ); - $q.all([getRootGroups,getPermissionSets]) + $q.all({ + rootGroups : getRootGroups, + permissionsSets : getPermissionSets + }) .then(function rootConnectionGroupsPermissionsRetrieved(data) { - deferred.resolve(generateHomePage(data[0],data[1])); + deferred.resolve(generateHomePage(data.rootGroups,data.permissionsSets)); }); return deferred.promise;