Merge pull request #59 from glyptodon/root-consistency

GUAC-964: Ensure connections and connection groups only refer to the root group as "ROOT"

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

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

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

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

guacamole/src/main/webapp/app/manage/controllers/manageController.js

@@ -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
      * have not yet been loaded, this will be null.