From 731f02fb0cb52f5cf6bb4af41d02b966e86352e2 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Sun, 29 Mar 2015 13:29:30 -0700
Subject: [PATCH] GUAC-1138: Filter and sort sessions based on pre-formatted
 date.

---
 .../webapp/app/manage/controllers/manageSessionsController.js  | 3 ++-
 .../src/main/webapp/app/manage/templates/manageSessions.html   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/guacamole/src/main/webapp/app/manage/controllers/manageSessionsController.js b/guacamole/src/main/webapp/app/manage/controllers/manageSessionsController.js
index 7874771fa..f89f19a32 100644
--- a/guacamole/src/main/webapp/app/manage/controllers/manageSessionsController.js
+++ b/guacamole/src/main/webapp/app/manage/controllers/manageSessionsController.js
@@ -64,7 +64,7 @@ angular.module('manage').controller('manageSessionsController', ['$scope', '$inj
      */
     $scope.wrapperOrder = new SortOrder([
         'activeConnection.username',
-        'activeConnection.startDate',
+        'startDate',
         'activeConnection.remoteHost',
         'name'
     ]);
@@ -76,6 +76,7 @@ angular.module('manage').controller('manageSessionsController', ['$scope', '$inj
      */
     $scope.filteredWrapperProperties = [
         'activeConnection.username',
+        'startDate',
         'activeConnection.remoteHost',
         'name'
     ];
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageSessions.html b/guacamole/src/main/webapp/app/manage/templates/manageSessions.html
index c1c1095b1..5b50f5f64 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manageSessions.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manageSessions.html
@@ -49,7 +49,7 @@ THE SOFTWARE.
                     <th guac-sort-order="wrapperOrder" guac-sort-property="'activeConnection.username'">
                         {{'MANAGE_SESSION.TABLE_HEADER_SESSION_USERNAME' | translate}}
                     </th>
-                    <th guac-sort-order="wrapperOrder" guac-sort-property="'activeConnection.startDate'">
+                    <th guac-sort-order="wrapperOrder" guac-sort-property="'startDate'">
                         {{'MANAGE_SESSION.TABLE_HEADER_SESSION_STARTDATE' | translate}}
                     </th>
                     <th guac-sort-order="wrapperOrder" guac-sort-property="'activeConnection.remoteHost'">