You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/12/06 12:02:22 UTC
[1/2] guacamole-client git commit: GUACAMOLE-598: Ignore if current
user has no associated data. Authentication providers are not required to
provide data for the users they authenticate.
Repository: guacamole-client
Updated Branches:
refs/heads/master caf07a92a -> a1e6db170
GUACAMOLE-598: Ignore if current user has no associated data. Authentication providers are not required to provide data for the users they authenticate.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/ef0cb1ee
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/ef0cb1ee
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/ef0cb1ee
Branch: refs/heads/master
Commit: ef0cb1ee7a6e9295193193242f959e5b4ebe7b4d
Parents: fc457c0
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Dec 4 13:22:13 2018 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Dec 4 13:22:16 2018 -0800
----------------------------------------------------------------------
.../src/main/webapp/app/navigation/directives/guacUserMenu.js | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/ef0cb1ee/guacamole/src/main/webapp/app/navigation/directives/guacUserMenu.js
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/navigation/directives/guacUserMenu.js b/guacamole/src/main/webapp/app/navigation/directives/guacUserMenu.js
index 5c6ad74..c6630e7 100644
--- a/guacamole/src/main/webapp/app/navigation/directives/guacUserMenu.js
+++ b/guacamole/src/main/webapp/app/navigation/directives/guacUserMenu.js
@@ -95,13 +95,10 @@ angular.module('navigation').directive('guacUserMenu', [function guacUserMenu()
*/
$scope.role = null;
- // Pull user data
+ // Display user profile attributes if available
userService.getUser(authenticationService.getDataSource(), $scope.username)
.then(function userRetrieved(user) {
- // Store retrieved user object
- $scope.user = user;
-
// Pull basic profile information
$scope.fullName = user.attributes[User.Attributes.FULL_NAME];
$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];
$scope.userURL = email ? 'mailto:' + email : null;
- }, requestService.DIE);
+ }, requestService.IGNORE);
/**
* The available main pages for the current user.
[2/2] guacamole-client git commit: GUACAMOLE-598: Merge ignore if
current user has no associated data.
Posted by vn...@apache.org.
GUACAMOLE-598: Merge ignore if current user has no associated data.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/a1e6db17
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/a1e6db17
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/a1e6db17
Branch: refs/heads/master
Commit: a1e6db170f286882670957e1e127cae061096bb3
Parents: caf07a9 ef0cb1e
Author: Nick Couchman <vn...@apache.org>
Authored: Thu Dec 6 07:01:31 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Thu Dec 6 07:01:31 2018 -0500
----------------------------------------------------------------------
.../src/main/webapp/app/navigation/directives/guacUserMenu.js | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------