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

GUAC-1373: Define sorting only by start date.

Browse Source
This commit is contained in:
Michael Jumper
2015-11-15 20:19:31 -08:00
committed by James Muehlner
parent 4e4ba9ac45
commit 77804b2a9d
6 changed files with 14 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/APIConnectionRecordSortPredicate.java
View File

@@ -46,29 +46,11 @@ public class APIConnectionRecordSortPredicate {
*/
public enum SortableProperty {
/**
* The name (not identifier) of the connection associated with the
* connection record.
*/
connectionName(ConnectionRecordSet.SortableProperty.CONNECTION_NAME),
/**
* The username (identifier) of the user associated with the connection
* record.
*/
username(ConnectionRecordSet.SortableProperty.USER_IDENTIFIER),
/**
* The date that the connection associated with the connection record
* began (connected).
*/
startDate(ConnectionRecordSet.SortableProperty.START_DATE),
/**
* The date that the connection associated with the connection record
* ended (disconnected).
*/
endDate(ConnectionRecordSet.SortableProperty.END_DATE);
startDate(ConnectionRecordSet.SortableProperty.START_DATE);
/**
* The ConnectionRecordSet.SortableProperty that this property name

20
guacamole/src/main/webapp/app/rest/types/ConnectionHistoryEntry.js
View File

@@ -110,29 +110,11 @@ angular.module('rest').factory('ConnectionHistoryEntry', [function defineConnect
*/
ConnectionHistoryEntry.SortPredicate = {
/**
* The name of the connection associated with the history entry (not
* the connection identifier).
*/
CONNECTION_NAME : 'connectionName',
/**
* The username of the user associated with the history entry (the user
* identifier).
*/
USER_IDENTIFIER : 'username',
/**
* The date and time that the connection associated with the history
* entry began (connected).
*/
START_DATE : 'startDate',
/**
* The date and time that the connection associated with the history
* entry ended (disconnected).
*/
END_DATE : 'endDate'
START_DATE : 'startDate'
};

4
guacamole/src/main/webapp/app/settings/directives/guacSettingsConnectionHistory.js
View File

@@ -164,7 +164,9 @@ angular.module('settings').directive('guacSettingsConnectionHistory', [function
historyService.getConnectionHistory(
$scope.dataSource,
requiredContents,
$scope.order.predicate
$scope.order.predicate.filter(function isSupportedPredicate(predicate) {
return predicate === 'startDate' || predicate === '-startDate';
})
)
.success(function historyRetrieved(historyRecords) {