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

GUACAMOLE-598: Merge ignore if current user has no associated data.

Browse Source
This commit is contained in:
Nick Couchman
2018-12-06 07:01:31 -05:00
parent caf07a92a9 ef0cb1ee7a
commit a1e6db170f
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
guacamole/src/main/webapp/app/navigation/directives/guacUserMenu.js
View File

@@ -95,13 +95,10 @@ angular.module('navigation').directive('guacUserMenu', [function guacUserMenu()
*/ */
$scope.role = null; $scope.role = null;
// Pull user data // Display user profile attributes if available
userService.getUser(authenticationService.getDataSource(), $scope.username) userService.getUser(authenticationService.getDataSource(), $scope.username)
.then(function userRetrieved(user) { .then(function userRetrieved(user) {
// Store retrieved user object
$scope.user = user;
// Pull basic profile information // Pull basic profile information
$scope.fullName = user.attributes[User.Attributes.FULL_NAME]; $scope.fullName = user.attributes[User.Attributes.FULL_NAME];
$scope.organization = user.attributes[User.Attributes.ORGANIZATION]; $scope.organization = user.attributes[User.Attributes.ORGANIZATION];
@@ -111,7 +108,7 @@ angular.module('navigation').directive('guacUserMenu', [function guacUserMenu()
var email = user.attributes[User.Attributes.EMAIL_ADDRESS]; var email = user.attributes[User.Attributes.EMAIL_ADDRESS];
$scope.userURL = email ? 'mailto:' + email : null; $scope.userURL = email ? 'mailto:' + email : null;
}, requestService.DIE); }, requestService.IGNORE);
/** /**
* The available main pages for the current user. * The available main pages for the current user.