safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 13:41:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-508: Use object instead of array for multiple promises.

Browse Source
This commit is contained in:
Nick Couchman
2018-03-02 21:45:21 -05:00
parent 4869968c8f
commit 8ad579b90b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
guacamole/src/main/webapp/app/navigation/services/userPageService.js
View File

@@ -163,9 +163,12 @@ angular.module('navigation').factory('userPageService', ['$injector',
authenticationService.getCurrentUsername() authenticationService.getCurrentUsername()
); );
$q.all([getRootGroups,getPermissionSets]) $q.all({
rootGroups : getRootGroups,
permissionsSets : getPermissionSets
})
.then(function rootConnectionGroupsPermissionsRetrieved(data) { .then(function rootConnectionGroupsPermissionsRetrieved(data) {
deferred.resolve(generateHomePage(data[0],data[1])); deferred.resolve(generateHomePage(data.rootGroups,data.permissionsSets));
}); });
return deferred.promise; return deferred.promise;