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

GUAC-586: Link to the first editable user account by default.

Browse Source
This commit is contained in:
Michael Jumper
2015-09-03 13:40:14 -07:00
parent 2dcadd584e
commit 873de9ddbf
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js
View File

@@ -194,7 +194,11 @@ angular.module('settings').directive('guacSettingsUsers', [function guacSettings
}; };
// Retrieve current permissions // Retrieve current permissions
dataSourceService.apply(permissionService.getPermissions, dataSources, currentUsername) dataSourceService.apply(
permissionService.getPermissions,
dataSources,
currentUsername
)
.then(function permissionsRetrieved(permissions) { .then(function permissionsRetrieved(permissions) {
// Store retrieved permissions // Store retrieved permissions
@@ -230,6 +234,12 @@ angular.module('settings').directive('guacSettingsUsers', [function guacSettings
if (addedUsers[user.username]) if (addedUsers[user.username])
return; return;
// Link to default creation data source if we cannot manage this user
if (!PermissionSet.hasSystemPermission(permissions[dataSource], PermissionSet.ObjectPermissionType.ADMINISTER)
&& !PermissionSet.hasUserPermission(permissions[dataSource], PermissionSet.ObjectPermissionType.UPDATE, user.username)
&& !PermissionSet.hasUserPermission(permissions[dataSource], PermissionSet.ObjectPermissionType.DELETE, user.username))
dataSource = getDefaultDataSource();
// Add user to overall list // Add user to overall list
addedUsers[user.username] = user; addedUsers[user.username] = user;
$scope.manageableUsers.push(new ManageableUser ({ $scope.manageableUsers.push(new ManageableUser ({