From 2e686b390a074c8a8fc05643edfaa147893132dc Mon Sep 17 00:00:00 2001
From: Kiran Nagasubramanian <nkiran87@gmail.com>
Date: Tue, 13 Sep 2011 15:17:45 -0700
Subject: [PATCH] CLOSES OOZIE-556 Sort on Web Console for non-string data type

---
 release-log.txt                         | 1 +
 webapp/src/main/webapp/oozie-console.js | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/release-log.txt b/release-log.txt
index 0a49499c3..845ae17ff 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 3.1.0 release
 
+OOZIE-556 Sort on Web Console for non-string data type
 OOZIE-37 Documentation related modifications for "log -action" option
 OOZIE-35 add auto-rerun for error codes JA008 and JA009 in action executor
 OOZIE-21 Fixed bug forked subwf not returning status to the parent wf job
diff --git a/webapp/src/main/webapp/oozie-console.js b/webapp/src/main/webapp/oozie-console.js
index 950a25d07..0cc375ce5 100644
--- a/webapp/src/main/webapp/oozie-console.js
+++ b/webapp/src/main/webapp/oozie-console.js
@@ -1151,7 +1151,7 @@ var coord_jobs_store = new Ext.data.JsonStore({
     totalProperty: 'total',
     autoLoad: true,
     root: 'coordinatorjobs',
-    fields: ['coordJobId', 'coordJobName', 'status', 'user', 'group', 'frequency', 'timeUnit', 'startTime', 'nextMaterializedTime'],
+    fields: ['coordJobId', 'coordJobName', 'status', 'user', 'group', 'frequency', 'timeUnit', {name: 'startTime', sortType: Ext.data.SortTypes.asDate}, {name: 'nextMaterializedTime', sortType: Ext.data.SortTypes.asDate}],
     proxy: new Ext.data.HttpProxy({
         url: getOozieBase() + 'jobs'
     })
@@ -1169,7 +1169,7 @@ var jobs_store = new Ext.data.JsonStore({
     totalProperty: 'total',
     autoLoad: true,
     root: 'workflows',
-    fields: ['appPath', 'appName', 'id', 'conf', 'status', 'createdTime', 'startTime', 'lastModTime', 'endTime', 'user', 'group', 'run', 'actions'],
+    fields: ['appPath', 'appName', 'id', 'conf', 'status', {name: 'createdTime', sortType: Ext.data.SortTypes.asDate}, {name: 'startTime', sortType: Ext.data.SortTypes.asDate}, {name: 'lastModTime', sortType: Ext.data.SortTypes.asDate}, {name: 'endTime', sortType: Ext.data.SortTypes.asDate}, 'user', 'group', 'run', 'actions'],
     proxy: new Ext.data.HttpProxy({
         url: getOozieBase() + 'jobs'
     })
@@ -1189,7 +1189,7 @@ var bundle_jobs_store = new Ext.data.JsonStore({
     totalProperty: 'total',
     autoLoad: true,
     root: 'bundlejobs',
-    fields: ['bundleJobId', 'bundleJobName', 'bundleJobPath', 'conf', 'status', 'kickoffTime', 'startTime', 'endTime', 'pauseTime', 'createdTime', 'user', 'group', 'bundleCoordJobs'],
+    fields: ['bundleJobId', 'bundleJobName', 'bundleJobPath', 'conf', 'status', {name: 'kickoffTime', sortType: Ext.data.SortTypes.asDate}, {name: 'startTime', sortType: Ext.data.SortTypes.asDate}, {name: 'endTime', sortType: Ext.data.SortTypes.asDate}, {name: 'pauseTime', sortType: Ext.data.SortTypes.asDate}, {name: 'createdTime', sortType: Ext.data.SortTypes.asDate}, 'user', 'group', 'bundleCoordJobs'],
     proxy: new Ext.data.HttpProxy({
         url: getOozieBase() + 'jobs'
     })