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

GUAC-932: Add support for recursive query (and break JS).

Browse Source
This commit is contained in:
Michael Jumper
2014-12-16 17:47:15 -08:00
parent 4d255e21a1
commit ac6e92860b
6 changed files with 227 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
guacamole/src/main/webapp/app/rest/services/connectionGroupService.js
View File

@@ -29,26 +29,26 @@ angular.module('rest').factory('connectionGroupService', ['$http', 'authenticati
var service = {};
/**
* Makes a request to the REST API to get the list of connection groups,
* returning a promise that provides an array of
* @link{ConnectionGroup} objects if successful.
* Makes a request to the REST API to get an individual connection group
* and all descendants, returning a promise that provides the corresponding
* @link{ConnectionGroup} if successful. Descendant groups and connections
* will be stored as children of that connection group.
*
* @param {String} [parentID=ConnectionGroup.ROOT_IDENTIFIER]
* The ID of the connection group whose child connection groups should
* be returned. If not provided, the root connection group will be
* used by default.
* @param {String} [connectionGroupID=ConnectionGroup.ROOT_IDENTIFIER]
* The ID of the connection group to retrieve. If not provided, the
* root connection group will be retrieved by default.
*
* @returns {Promise.<ConnectionGroup[]>}
* A promise which will resolve with an array of @link{ConnectionGroup}
* objects upon success.
* @returns {Promise.ConnectionGroup}
* A promise which will resolve with a @link{ConnectionGroup} upon
* success.
*/
service.getConnectionGroups = function getConnectionGroups(parentID) {
service.getConnectionGroupTree = function getConnectionGroupTree(connectionGroupID) {
var parentIDParam = "";
if (parentID)
parentIDParam = "&parentID=" + parentID;
// Use the root connection group ID if no ID is passed in
connectionGroupID = connectionGroupID || ConnectionGroup.ROOT_IDENTIFIER;
return $http.get("api/connectionGroup?token=" + authenticationService.getCurrentToken() + parentIDParam);
return $http.get("api/connectionGroup/" + connectionGroupID + "/tree?token=" + authenticationService.getCurrentToken());
};
/**
@@ -70,6 +70,7 @@ angular.module('rest').factory('connectionGroupService', ['$http', 'authenticati
connectionGroupID = connectionGroupID || ConnectionGroup.ROOT_IDENTIFIER;
return $http.get("api/connectionGroup/" + connectionGroupID + "?token=" + authenticationService.getCurrentToken());
};
/**

18
guacamole/src/main/webapp/app/rest/types/ConnectionGroup.js
View File

@@ -73,6 +73,24 @@ angular.module('rest').factory('ConnectionGroup', [function defineConnectionGrou
*/
this.type = template.type || ConnectionGroup.Type.ORGANIZATIONAL;
/**
* An array of all child connections, if known. This property may be
* null or undefined if children have not been queried, and thus the
* child connections are unknown.
*
* @type Connection[]
*/
this.childConnections = template.childConnections;
/**
* An array of all child connection groups, if known. This property may
* be null or undefined if children have not been queried, and thus the
* child connection groups are unknown.
*
* @type ConnectionGroup[]
*/
this.childConnectionGroups = template.childConnectionGroups;
};
/**