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

Merge pull request #59 from glyptodon/root-consistency

Browse Source 
GUAC-964: Ensure connections and connection groups only refer to the root group as "ROOT"
This commit is contained in:
James Muehlner
2015-01-05 08:53:38 -08:00
parent c36a9948ab ca6259ed6a
commit 17a699e7f5
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java
View File

@@ -108,7 +108,7 @@ public class MySQLConnection extends AbstractConnection {
if (parentID != null) if (parentID != null)
this.setParentIdentifier(String.valueOf(parentID)); this.setParentIdentifier(String.valueOf(parentID));
else else
this.setParentIdentifier(null); this.setParentIdentifier(MySQLConstants.CONNECTION_GROUP_ROOT_IDENTIFIER);
} }

2
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionGroup.java
View File

@@ -129,7 +129,7 @@ public class MySQLConnectionGroup extends AbstractConnectionGroup {
if (parentID != null) if (parentID != null)
this.setParentIdentifier(String.valueOf(parentID)); this.setParentIdentifier(String.valueOf(parentID));
else else
this.setParentIdentifier(null); this.setParentIdentifier(MySQLConstants.CONNECTION_GROUP_ROOT_IDENTIFIER);
} }

14
guacamole/src/main/webapp/app/manage/controllers/manageController.js
View File

@@ -49,6 +49,20 @@ angular.module('manage').controller('manageController', ['$scope', '$injector',
} }
}; };
/**
* All visible users.
*
* @type User[]
*/
$scope.users = null;
/**
* The root connection group of the connection group hierarchy.
*
* @type ConnectionGroup
*/
$scope.rootGroup = null;
/** /**
* Whether the current user can manage users. If the current permissions * Whether the current user can manage users. If the current permissions
* have not yet been loaded, this will be null. * have not yet been loaded, this will be null.