This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit ad9f90718c6da4c7370fb558e6f5a0d79ba00516 Merge: 6b1aada1e 501b401a2 Author: Virtually Nick <[email protected]> AuthorDate: Thu Jun 15 21:52:23 2023 -0400 Merge 1.5.3 changes back to master. .../src/app/settings/directives/guacSettingsPreferences.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --cc guacamole/src/main/frontend/src/app/settings/directives/guacSettingsPreferences.js index 005d2398b,3ab03d028..4656631de --- a/guacamole/src/main/frontend/src/app/settings/directives/guacSettingsPreferences.js +++ b/guacamole/src/main/frontend/src/app/settings/directives/guacSettingsPreferences.js @@@ -207,13 -174,20 +207,20 @@@ angular.module('settings').directive('g permissionService.getEffectivePermissions(dataSource, username) .then(function permissionsRetrieved(permissions) { - // Add action for updating password - $scope.canChangePassword = ( + // 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.canChangePassword = false; + $scope.canUpdateSelf = false; })); /**
