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

GUACAMOLE-394: List users in a table displaying last active time.

Browse Source
This commit is contained in:
Michael Jumper
2017-09-18 12:36:35 -07:00
parent 67fc77a1c7
commit 138ea40dc9
10 changed files with 134 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,9 +36,11 @@ angular.module('settings').directive('guacSettingsUsers', [function guacSettings
// Required types
var ManageableUser = $injector.get('ManageableUser');
var PermissionSet = $injector.get('PermissionSet');
var SortOrder = $injector.get('SortOrder');
// Required services
var $location = $injector.get('$location');
var $translate = $injector.get('$translate');
var authenticationService = $injector.get('authenticationService');
var dataSourceService = $injector.get('dataSourceService');
var guacNotification = $injector.get('guacNotification');
@@ -98,9 +100,37 @@ angular.module('settings').directive('guacSettingsUsers', [function guacSettings
* @type String[]
*/
$scope.filteredUserProperties = [
'user.lastActive',
'user.username'
];
/**
* The date format for use for the last active date.
*
* @type String
*/
$scope.dateFormat = null;
/**
* SortOrder instance which stores the sort order of the listed
* users.
*
* @type SortOrder
*/
$scope.order = new SortOrder([
'user.username',
'-user.lastActive'
]);
// Get session date format
$translate('SETTINGS_USERS.FORMAT_DATE')
.then(function dateFormatReceived(retrievedDateFormat) {
// Store received date format
$scope.dateFormat = retrievedDateFormat;
});
/**
* Returns whether critical data has completed being loaded.
*
@@ -110,7 +140,8 @@ angular.module('settings').directive('guacSettingsUsers', [function guacSettings
*/
$scope.isLoaded = function isLoaded() {
return $scope.manageableUsers !== null
return $scope.dateFormat !== null
&& $scope.manageableUsers !== null
&& $scope.permissions !== null;
};