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

GUAC-586: Invoke REST service functions across multiple data sources using dataSourceService.apply().

Browse Source
This commit is contained in:
Michael Jumper
2015-08-31 14:08:11 -07:00
parent 8f39671c6b
commit 7235ed980f
6 changed files with 138 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,8 +34,9 @@ angular.module('navigation').factory('userPageService', ['$injector',
// Get required services
var $q = $injector.get('$q');
var authenticationService = $injector.get('authenticationService');
var connectionGroupService = $injector.get("connectionGroupService");
var permissionService = $injector.get("permissionService");
var connectionGroupService = $injector.get('connectionGroupService');
var dataSourceService = $injector.get('dataSourceService');
var permissionService = $injector.get('permissionService');
var service = {};
@@ -259,7 +260,8 @@ angular.module('navigation').factory('userPageService', ['$injector',
var deferred = $q.defer();
// Retrieve current permissions
permissionService.getAllPermissions(
dataSourceService.apply(
permissionService.getPermissions,
authenticationService.getAvailableDataSources(),
authenticationService.getCurrentUsername()
)
@@ -346,7 +348,8 @@ angular.module('navigation').factory('userPageService', ['$injector',
});
// Retrieve current permissions
permissionService.getAllPermissions(
dataSourceService.apply(
permissionService.getPermissions,
authenticationService.getAvailableDataSources(),
authenticationService.getCurrentUsername()
)