GUAC-1120: Move logout panel to common user menu.

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

@@ -128,6 +128,14 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
      */
     $scope.canCloneConnection = null;
 
+    /**
+     * All permissions associated with the current user, or null if the user's
+     * permissions have not yet been loaded.
+     *
+     * @type PermissionSet
+     */
+    $scope.permissions = null;
+
     /**
      * Returns whether critical data has completed being loaded.
      *
@@ -142,6 +150,7 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
             && $scope.connection           !== null
             && $scope.parameters           !== null
             && $scope.historyEntryWrappers !== null
+            && $scope.permissions          !== null
             && $scope.canSaveConnection    !== null
             && $scope.canDeleteConnection  !== null
             && $scope.canCloneConnection   !== null;
@@ -159,21 +168,23 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
     permissionService.getPermissions(authenticationService.getCurrentUserID())
             .success(function permissionsReceived(permissions) {
                 
-         // Check if the connection is new or if the user has UPDATE permission
-         $scope.canSaveConnection =
+        $scope.permissions = permissions;
+                        
+        // Check if the connection is new or if the user has UPDATE permission
+        $scope.canSaveConnection =
                !identifier
             || PermissionSet.hasSystemPermission(permissions, PermissionSet.SystemPermissionType.ADMINISTER)
             || PermissionSet.hasConnectionPermission(permissions, PermissionSet.ObjectPermissionType.UPDATE, identifier);
             
-         // Check if connection is not new and the user has DELETE permission
-         $scope.canDeleteConnection =
+        // Check if connection is not new and the user has DELETE permission
+        $scope.canDeleteConnection =
             !!identifier && (
                    PermissionSet.hasSystemPermission(permissions, PermissionSet.SystemPermissionType.ADMINISTER)
                ||  PermissionSet.hasConnectionPermission(permissions, PermissionSet.ObjectPermissionType.DELETE, identifier)
             );
                 
-         // Check if the connection is not new and the user has UPDATE and CREATE_CONNECTION permissions
-         $scope.canCloneConnection =
+        // Check if the connection is not new and the user has UPDATE and CREATE_CONNECTION permissions
+        $scope.canCloneConnection =
             !!identifier && (
                PermissionSet.hasSystemPermission(permissions, PermissionSet.SystemPermissionType.ADMINISTER) || (
                        PermissionSet.hasConnectionPermission(permissions, PermissionSet.ObjectPermissionType.UPDATE, identifier)

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

@@ -85,6 +85,14 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
      */
     $scope.hasDeletePermission = null;
 
+    /**
+     * All permissions associated with the current user, or null if the user's
+     * permissions have not yet been loaded.
+     *
+     * @type PermissionSet
+     */
+    $scope.permissions = null;
+
     /**
      * Returns whether critical data has completed being loaded.
      *
@@ -96,6 +104,7 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
 
         return $scope.rootGroup                !== null
             && $scope.connectionGroup          !== null
+            && $scope.permissions              !== null
             && $scope.canSaveConnectionGroup   !== null
             && $scope.canDeleteConnectionGroup !== null;
 
@@ -105,6 +114,8 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
     permissionService.getPermissions(authenticationService.getCurrentUserID())
             .success(function permissionsReceived(permissions) {
                 
+        $scope.permissions = permissions;
+                        
         // Check if the connection group is new or if the user has UPDATE permission
         $scope.canSaveConnectionGroup =
               !identifier

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

@@ -115,6 +115,14 @@ angular.module('manage').controller('manageController', ['$scope', '$injector',
      */
     $scope.newUsername = "";
 
+    /**
+     * All permissions associated with the current user, or null if the user's
+     * permissions have not yet been loaded.
+     *
+     * @type PermissionSet
+     */
+    $scope.permissions = null;
+
     /**
      * Returns whether critical data has completed being loaded.
      *
@@ -126,6 +134,7 @@ angular.module('manage').controller('manageController', ['$scope', '$injector',
 
         return $scope.users                     !== null
             && $scope.rootGroup                 !== null
+            && $scope.permissions               !== null
             && $scope.canManageUsers            !== null
             && $scope.canManageConnections      !== null
             && $scope.canCreateUsers            !== null
@@ -138,6 +147,8 @@ angular.module('manage').controller('manageController', ['$scope', '$injector',
     permissionService.getPermissions(currentUserID)
     .success(function permissionsRetrieved(permissions) {
 
+        $scope.permissions = permissions;
+                        
         // Ignore permission to update root group
         PermissionSet.removeConnectionGroupPermission(permissions, PermissionSet.ObjectPermissionType.UPDATE, ConnectionGroup.ROOT_IDENTIFIER);
 

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

@@ -93,6 +93,14 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
      */
     $scope.hasDeletePermission = null;
 
+    /**
+     * All permissions associated with the current user, or null if the user's
+     * permissions have not yet been loaded.
+     *
+     * @type PermissionSet
+     */
+    $scope.permissions = null;
+
     /**
      * Returns whether critical data has completed being loaded.
      *
@@ -105,6 +113,7 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
         return $scope.user                !== null
             && $scope.permissionFlags     !== null
             && $scope.rootGroup           !== null
+            && $scope.permissions         !== null
             && $scope.canSaveUser         !== null
             && $scope.canDeleteUser       !== null;
 
@@ -129,7 +138,9 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
     // Query the user's permissions for the current connection
     permissionService.getPermissions(authenticationService.getCurrentUserID())
             .success(function permissionsReceived(permissions) {
-                
+
+        $scope.permissions = permissions;
+                        
         // Check if the user is new or if the user has UPDATE permission
         $scope.canSaveUser =
               !username