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|
- +
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; };