safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 21:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-624: Merge include user full name and organization in display and filter.

Browse Source
This commit is contained in:
Nick Couchman
2018-09-21 20:29:03 -04:00
parent 0f93e7ff45 d4a9208c2b
commit 355f76b15e
6 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js
View File

@@ -88,6 +88,8 @@ angular.module('settings').directive('guacSettingsUsers', [function guacSettings
* @type String[] * @type String[]
*/ */
$scope.filteredUserProperties = [ $scope.filteredUserProperties = [
'user.attributes["guac-full-name"]',
'user.attributes["guac-organization"]',
'user.lastActive', 'user.lastActive',
'user.username' 'user.username'
]; ];
@@ -107,7 +109,9 @@ angular.module('settings').directive('guacSettingsUsers', [function guacSettings
*/ */
$scope.order = new SortOrder([ $scope.order = new SortOrder([
'user.username', 'user.username',
'-user.lastActive' '-user.lastActive',
'user.attributes["guac-organization"]',
'user.attributes["guac-full-name"]'
]); ]);
// Get session date format // Get session date format

7
guacamole/src/main/webapp/app/settings/styles/user-list.css
View File

@@ -24,12 +24,11 @@
.settings.users table.user-list th.last-active, .settings.users table.user-list th.last-active,
.settings.users table.user-list td.last-active { .settings.users table.user-list td.last-active {
white-space: nowrap; white-space: nowrap;
width: 0;
} }
.settings.users table.user-list th.username, .settings.users table.user-list th,
.settings.users table.user-list td.username { .settings.users table.user-list td {
width: 100%; width: 25%;
} }
.settings.users table.user-list tr.user td.username a[href] { .settings.users table.user-list tr.user td.username a[href] {

8
guacamole/src/main/webapp/app/settings/templates/settingsUsers.html
View File

@@ -27,6 +27,12 @@
<th guac-sort-order="order" guac-sort-property="'user.username'" class="username"> <th guac-sort-order="order" guac-sort-property="'user.username'" class="username">
{{'SETTINGS_USERS.TABLE_HEADER_USERNAME' | translate}} {{'SETTINGS_USERS.TABLE_HEADER_USERNAME' | translate}}
</th> </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"> <th guac-sort-order="order" guac-sort-property="'user.lastActive'" class="last-active">
{{'SETTINGS_USERS.TABLE_HEADER_LAST_ACTIVE' | translate}} {{'SETTINGS_USERS.TABLE_HEADER_LAST_ACTIVE' | translate}}
</th> </th>
@@ -40,6 +46,8 @@
<span class="name">{{manageableUser.user.username}}</span> <span class="name">{{manageableUser.user.username}}</span>
</a> </a>
</td> </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> <td class="last-active">{{manageableUser.user.lastActive | date : dateFormat}}</td>
</tr> </tr>
</tbody> </tbody>

2
guacamole/src/main/webapp/translations/en.json
View File

@@ -789,7 +789,9 @@
"SECTION_HEADER_USERS" : "Users", "SECTION_HEADER_USERS" : "Users",
"TABLE_HEADER_FULL_NAME" : "Full name",
"TABLE_HEADER_LAST_ACTIVE" : "Last active", "TABLE_HEADER_LAST_ACTIVE" : "Last active",
"TABLE_HEADER_ORGANIZATION" : "Organization",
"TABLE_HEADER_USERNAME" : "Username" "TABLE_HEADER_USERNAME" : "Username"
}, },

6
guacamole/src/main/webapp/translations/es.json
View File

@@ -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.", "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"
}, },

2
guacamole/src/main/webapp/translations/zh.json
View File

@@ -714,7 +714,9 @@
"SECTION_HEADER_USERS" : "用户", "SECTION_HEADER_USERS" : "用户",
"TABLE_HEADER_FULL_NAME" : "全名",
"TABLE_HEADER_LAST_ACTIVE" : "最近活动", "TABLE_HEADER_LAST_ACTIVE" : "最近活动",
"TABLE_HEADER_ORGANIZATION" : "组织",
"TABLE_HEADER_USERNAME" : "用户名" "TABLE_HEADER_USERNAME" : "用户名"
}, },