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/09/22 00:29:40 UTC
[2/3] guacamole-client git commit: GUACAMOLE-624: Include user full
name and organization in filtered attributes.
GUACAMOLE-624: Include user full name and organization in filtered attributes.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/d4a9208c
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/d4a9208c
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/d4a9208c
Branch: refs/heads/master
Commit: d4a9208c2bf7b757e070e80410fcbc1617219709
Parents: 660fe82
Author: Michael Jumper <mj...@apache.org>
Authored: Fri Sep 21 14:14:57 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Fri Sep 21 14:14:57 2018 -0700
----------------------------------------------------------------------
.../main/webapp/app/settings/directives/guacSettingsUsers.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/d4a9208c/guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js b/guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js
index 94435ba..6b8c6e0 100644
--- a/guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js
+++ b/guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js
@@ -88,6 +88,8 @@ angular.module('settings').directive('guacSettingsUsers', [function guacSettings
* @type String[]
*/
$scope.filteredUserProperties = [
+ 'user.attributes["guac-full-name"]',
+ 'user.attributes["guac-organization"]',
'user.lastActive',
'user.username'
];
@@ -107,7 +109,9 @@ angular.module('settings').directive('guacSettingsUsers', [function guacSettings
*/
$scope.order = new SortOrder([
'user.username',
- '-user.lastActive'
+ '-user.lastActive',
+ 'user.attributes["guac-organization"]',
+ 'user.attributes["guac-full-name"]'
]);
// Get session date format