From 44ea49b06c6f93081685d4bb05b48095e1ef0221 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 15 Jul 2009 17:46:47 +0000
Subject: [PATCH] Sorting search results works now.  Added a button to clear
 the search and submit the form.

---
 docs/changelog/7.x.x.txt                                 | 1 +
 lib/WebGUI/Content/AssetHistory.pm                       | 2 +-
 www/extras/yui-webgui/build/assetHistory/assetHistory.js | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index df1553db5..569eb3edc 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -17,6 +17,7 @@
     account in the overview yielding zero or neagtive transaction amounts on
     the screen. ( Martin Kamerbeek / Oqapi )
   - fixed #10646: Asset History not paginated
+  - fixed #10645: Asset History: search results not sorted as expected
 
 7.7.14
  - fixed #10606: shelf selector
diff --git a/lib/WebGUI/Content/AssetHistory.pm b/lib/WebGUI/Content/AssetHistory.pm
index e9c3cea14..4780509eb 100644
--- a/lib/WebGUI/Content/AssetHistory.pm
+++ b/lib/WebGUI/Content/AssetHistory.pm
@@ -149,7 +149,7 @@ sub www_view {
     
     $output .= q|
   <div class="yui-skin-sam">  
-    <div id="search"><form id="keywordSearchForm"><input type="text" name="keywords" id="keywordsField" /><input type="submit" value="|.$i18n->get(364, 'WebGUI').q|" /></form></div>
+    <div id="search"><form id="keywordSearchForm"><input type="text" name="keywords" id="keywordsField" /><input type="submit" value="|.$i18n->get(364, 'WebGUI').q|" /><input type="submit" value="|.$i18n->get('Clear', 'WebGUI').q|" onclick="this.form.keywords.value='';"/></form></div>
     <div id="paginationTop"></div>
     <div id="historyData"></div>
     <div id="paginationBot"></div>
diff --git a/www/extras/yui-webgui/build/assetHistory/assetHistory.js b/www/extras/yui-webgui/build/assetHistory/assetHistory.js
index b160421b6..ca8034648 100644
--- a/www/extras/yui-webgui/build/assetHistory/assetHistory.js
+++ b/www/extras/yui-webgui/build/assetHistory/assetHistory.js
@@ -27,6 +27,7 @@ WebGUI.AssetHistory.BuildQueryString = function ( state, dt ) {
               + ';sortDir='   + ((state.sortedBy.dir === YAHOO.widget.DataTable.CLASS_DESC) ? "DESC" : "ASC")
               + ';results='   + state.pagination.rowsPerPage
               + ';sortKey='   + state.sortedBy.key
+              + ';keywords='  + YAHOO.util.Dom.get('keywordsField').value 
               ;
         return query;
     };