safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-10 07:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-586: Clarify auth result and include data source. Consistently refer to usernames as "username", not "user IDs".

Browse Source
This commit is contained in:
Michael Jumper
2015-08-27 23:00:34 -07:00
parent b0ac5d22ff
commit 405448116f
13 changed files with 218 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole/src/main/webapp/app/settings/directives/guacSettingsConnections.js
View File

@@ -48,7 +48,7 @@ angular.module('settings').directive('guacSettingsConnections', [function guacSe
var permissionService = $injector.get('permissionService');
// Identifier of the current user
var currentUserID = authenticationService.getCurrentUserID();
var currentUsername = authenticationService.getCurrentUsername();
/**
* An action to be provided along with the object sent to
@@ -120,7 +120,7 @@ angular.module('settings').directive('guacSettingsConnections', [function guacSe
};
// Retrieve current permissions
permissionService.getPermissions(currentUserID)
permissionService.getPermissions(currentUsername)
.success(function permissionsRetrieved(permissions) {
$scope.permissions = permissions;

2
guacamole/src/main/webapp/app/settings/directives/guacSettingsPreferences.js
View File

@@ -64,7 +64,7 @@ angular.module('settings').directive('guacSettingsPreferences', [function guacSe
*
* @type String
*/
var username = authenticationService.getCurrentUserID();
var username = authenticationService.getCurrentUsername();
/**
* All currently-set preferences, or their defaults if not yet set.

2
guacamole/src/main/webapp/app/settings/directives/guacSettingsSessions.js
View File

@@ -187,7 +187,7 @@ angular.module('settings').directive('guacSettingsSessions', [function guacSetti
};
// Query the user's permissions
permissionService.getPermissions(authenticationService.getCurrentUserID())
permissionService.getPermissions(authenticationService.getCurrentUsername())
.success(function permissionsReceived(retrievedPermissions) {
$scope.permissions = retrievedPermissions;
});

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

@@ -48,7 +48,7 @@ angular.module('settings').directive('guacSettingsUsers', [function guacSettings
var userService = $injector.get('userService');
// Identifier of the current user
var currentUserID = authenticationService.getCurrentUserID();
var currentUsername = authenticationService.getCurrentUsername();
/**
* An action to be provided along with the object sent to
@@ -118,7 +118,7 @@ angular.module('settings').directive('guacSettingsUsers', [function guacSettings
};
// Retrieve current permissions
permissionService.getPermissions(currentUserID)
permissionService.getPermissions(currentUsername)
.success(function permissionsRetrieved(permissions) {
$scope.permissions = permissions;
@@ -147,7 +147,7 @@ angular.module('settings').directive('guacSettingsUsers', [function guacSettings
// Display only other users, not self
$scope.users = users.filter(function isNotSelf(user) {
return user.username !== currentUserID;
return user.username !== currentUsername;
});
});