From 660fe82fff8fff3ab3a7a5948a3b260315d8f67e Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Fri, 21 Sep 2018 14:14:39 -0700
Subject: [PATCH 1/2] GUACAMOLE-624: Add columns displaying user full name and
 organization.

---
 .../src/main/webapp/app/settings/styles/user-list.css     | 7 +++----
 .../main/webapp/app/settings/templates/settingsUsers.html | 8 ++++++++
 guacamole/src/main/webapp/translations/en.json            | 2 ++
 guacamole/src/main/webapp/translations/es.json            | 6 +++++-
 guacamole/src/main/webapp/translations/zh.json            | 2 ++
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/guacamole/src/main/webapp/app/settings/styles/user-list.css b/guacamole/src/main/webapp/app/settings/styles/user-list.css
index 6c0edd59f..e130d0da1 100644
--- a/guacamole/src/main/webapp/app/settings/styles/user-list.css
+++ b/guacamole/src/main/webapp/app/settings/styles/user-list.css
@@ -24,12 +24,11 @@
 .settings.users table.user-list th.last-active,
 .settings.users table.user-list td.last-active {
     white-space: nowrap;
-    width: 0;
 }
 
-.settings.users table.user-list th.username,
-.settings.users table.user-list td.username {
-    width: 100%;
+.settings.users table.user-list th,
+.settings.users table.user-list td {
+    width: 25%;
 }
 
 .settings.users table.user-list tr.user td.username a[href] {
diff --git a/guacamole/src/main/webapp/app/settings/templates/settingsUsers.html b/guacamole/src/main/webapp/app/settings/templates/settingsUsers.html
index 67f6760eb..232a1f252 100644
--- a/guacamole/src/main/webapp/app/settings/templates/settingsUsers.html
+++ b/guacamole/src/main/webapp/app/settings/templates/settingsUsers.html
@@ -27,6 +27,12 @@
                 <th guac-sort-order="order" guac-sort-property="'user.username'" class="username">
                     {{'SETTINGS_USERS.TABLE_HEADER_USERNAME' | translate}}
                 </th>
+                <th guac-sort-order="order" guac-sort-property="'user.attributes[\'guac-organization\']'" class="organization">
+                    {{'SETTINGS_USERS.TABLE_HEADER_ORGANIZATION' | translate}}
+                </th>
+                <th guac-sort-order="order" guac-sort-property="'user.attributes[\'guac-full-name\']'" class="full-name">
+                    {{'SETTINGS_USERS.TABLE_HEADER_FULL_NAME' | translate}}
+                </th>
                 <th guac-sort-order="order" guac-sort-property="'user.lastActive'" class="last-active">
                     {{'SETTINGS_USERS.TABLE_HEADER_LAST_ACTIVE' | translate}}
                 </th>
@@ -40,6 +46,8 @@
                         <span class="name">{{manageableUser.user.username}}</span>
                     </a>
                 </td>
+                <td class="organization">{{manageableUser.user.attributes['guac-organization']}}</td>
+                <td class="full-name">{{manageableUser.user.attributes['guac-full-name']}}</td>
                 <td class="last-active">{{manageableUser.user.lastActive | date : dateFormat}}</td>
             </tr>
         </tbody>
diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json
index fe80ddef6..8ce4d16a7 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -789,7 +789,9 @@
 
         "SECTION_HEADER_USERS"       : "Users",
 
+        "TABLE_HEADER_FULL_NAME"   : "Full name",
         "TABLE_HEADER_LAST_ACTIVE" : "Last active",
+        "TABLE_HEADER_ORGANIZATION" : "Organization",
         "TABLE_HEADER_USERNAME"    : "Username"
 
     },
diff --git a/guacamole/src/main/webapp/translations/es.json b/guacamole/src/main/webapp/translations/es.json
index f2545bb25..c165d5c64 100644
--- a/guacamole/src/main/webapp/translations/es.json
+++ b/guacamole/src/main/webapp/translations/es.json
@@ -678,7 +678,11 @@
 
         "HELP_USERS" : "Haga Clic o toque un usuario abajo para gestionar dicho usuario. Dependiendo de su nivel de acceso, podrá añadir/borrar usuarios y cambiar sus contraseñas.",
 
-        "SECTION_HEADER_USERS"       : "Usuarios"
+        "SECTION_HEADER_USERS"       : "Usuarios",
+
+        "TABLE_HEADER_FULL_NAME"   : "Nombre completo",
+        "TABLE_HEADER_ORGANIZATION" : "Organización",
+        "TABLE_HEADER_USERNAME"    : "Usuario"
 
     },
     
diff --git a/guacamole/src/main/webapp/translations/zh.json b/guacamole/src/main/webapp/translations/zh.json
index dae03ec1d..eca865660 100644
--- a/guacamole/src/main/webapp/translations/zh.json
+++ b/guacamole/src/main/webapp/translations/zh.json
@@ -714,7 +714,9 @@
 
         "SECTION_HEADER_USERS"       : "用户",
 
+        "TABLE_HEADER_FULL_NAME"   : "全名",
         "TABLE_HEADER_LAST_ACTIVE" : "最近活动",
+        "TABLE_HEADER_ORGANIZATION" : "组织",
         "TABLE_HEADER_USERNAME"    : "用户名"
 
     },

From d4a9208c2bf7b757e070e80410fcbc1617219709 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Fri, 21 Sep 2018 14:14:57 -0700
Subject: [PATCH 2/2] GUACAMOLE-624: Include user full name and organization in
 filtered attributes.

---
 .../webapp/app/settings/directives/guacSettingsUsers.js     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js b/guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js
index 94435bacb..6b8c6e06a 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