GUACAMOLE-624: Merge include user full name and organization in display and filter.
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 @@
* @type String[]
*/
$scope.filteredUserProperties = [
+ 'user.attributes["guac-full-name"]',
+ 'user.attributes["guac-organization"]',
'user.lastActive',
'user.username'
];
@@ -107,7 +109,9 @@
*/
$scope.order = new SortOrder([
'user.username',
- '-user.lastActive'
+ '-user.lastActive',
+ 'user.attributes["guac-organization"]',
+ 'user.attributes["guac-full-name"]'
]);
// Get session date format
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 6c0edd5..e130d0d 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 67f6760..232a1f2 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 fe80dde..8ce4d16 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 f2545bb..c165d5c 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 dae03ec..eca8656 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" : "用户名"
},
