mirror of
				https://github.com/gyurix1968/guacamole-client.git
				synced 2025-10-31 00:53:21 +00:00 
			
		
		
		
	Merge 1.5.3 changes back to master.
This commit is contained in:
		| @@ -208,9 +208,16 @@ angular.module('settings').directive('guacSettingsPreferences', [function guacSe | ||||
|             .then(function permissionsRetrieved(permissions) { | ||||
|  | ||||
|                 // Add action for updaing password or user preferences if permission is granted | ||||
|                 $scope.canUpdateSelf = PermissionSet.hasUserPermission(permissions, | ||||
|                         PermissionSet.ObjectPermissionType.UPDATE, username); | ||||
|                          | ||||
|                 $scope.canUpdateSelf = ( | ||||
|  | ||||
|                         // If permission is explicitly granted | ||||
|                         PermissionSet.hasUserPermission(permissions, | ||||
|                             PermissionSet.ObjectPermissionType.UPDATE, username) | ||||
|  | ||||
|                         // Or if implicitly granted through being an administrator | ||||
|                         || PermissionSet.hasSystemPermission(permissions, | ||||
|                             PermissionSet.SystemPermissionType.ADMINISTER)); | ||||
|  | ||||
|             }) | ||||
|             ['catch'](requestService.createErrorCallback(function permissionsFailed(error) { | ||||
|                 $scope.canUpdateSelf = false; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user