From a2540ddbfd5086c6eabb9b8cc5ea3e4c7a2efc4e Mon Sep 17 00:00:00 2001
From: Yung Han Khoe <yung@webgui-svn>
Date: Sun, 12 Apr 2009 21:06:12 +0000
Subject: [PATCH] added alphanumeric sort button to Matrix defaul view

---
 docs/changelog/7.x.x.txt                         |   1 +
 .../matrix-default-view-template.wgpkg           | Bin 0 -> 2170 bytes
 .../packages-7.7.4/new-matrix_matrix.css.wgpkg   | Bin 0 -> 3333 bytes
 lib/WebGUI/Asset/Wobject/Matrix.pm               |   4 +++-
 www/extras/wobject/Matrix/matrix.js              |   9 +++++++++
 5 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 docs/upgrades/packages-7.7.4/matrix-default-view-template.wgpkg
 create mode 100644 docs/upgrades/packages-7.7.4/new-matrix_matrix.css.wgpkg

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 0d40b782c..b9413437e 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -5,6 +5,7 @@
  - Survey [[question variable]] now returns the shown answer text for multiple choice questions, and the recorded value for non-multiple choice questions.
  - fixed #10142: Matrix 2.0 - Search screen compare button not functional
  - fixed #10141: Matrix 2.0 - Search does not check matching products
+ - fixed #10077: after matrix sort can't return to alphanumeric sort
 
 7.7.3
  - fixed #10094: double explanation in thread help
diff --git a/docs/upgrades/packages-7.7.4/matrix-default-view-template.wgpkg b/docs/upgrades/packages-7.7.4/matrix-default-view-template.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..a14d224e65617195294b5c872c15ade75ab7fd73
GIT binary patch
literal 2170
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

literal 0
HcmV?d00001

diff --git a/docs/upgrades/packages-7.7.4/new-matrix_matrix.css.wgpkg b/docs/upgrades/packages-7.7.4/new-matrix_matrix.css.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..4bc8beccfe63404b8940f7c43e212e01a5f97912
GIT binary patch
literal 3333
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
PG7bC>^*@hQ05$*so-uxh

literal 0
HcmV?d00001

diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm
index ab94c7fed..99d66dc60 100644
--- a/lib/WebGUI/Asset/Wobject/Matrix.pm
+++ b/lib/WebGUI/Asset/Wobject/Matrix.pm
@@ -567,6 +567,8 @@ sub view {
         $varStatistics = JSON->new->decode($varStatisticsEncoded);
     }
     else{
+        $varStatistics->{alphanumeric_sortButton}   = "<span id='sortByName'><button type='button'>Sort by name</button></span><br />";
+
         # Get the MatrixListing with the most views as an object using getLineage.
         my ($bestViews_listing) = @{ $self->getLineage(['descendants'], {
             includeOnlyClasses  => ['WebGUI::Asset::MatrixListing'],
@@ -629,7 +631,7 @@ sub view {
                         lastUpdated => $self->session->datetime->epochToHuman($lastUpdatedListing->get('lastUpdated'),"%z")
                     });
         }
-        $var->{lastUpdated_sortButton}  = "<span id='sortByUpdated'><button type='button'>Sort by updated</button></span><br />";
+        $varStatistics->{lastUpdated_sortButton}  = "<span id='sortByUpdated'><button type='button'>Sort by updated</button></span><br />";
 
         # For each category, get the MatrixListings with the best ratings.
 
diff --git a/www/extras/wobject/Matrix/matrix.js b/www/extras/wobject/Matrix/matrix.js
index 200016420..464742f2c 100644
--- a/www/extras/wobject/Matrix/matrix.js
+++ b/www/extras/wobject/Matrix/matrix.js
@@ -77,6 +77,15 @@ YAHOO.util.Event.addListener(window, "load", function() {
         },this,true);
 	}
 
+	if(document.getElementById("sortByName")){
+	var btnSortByName = new YAHOO.widget.Button("sortByName");
+        btnSortByName.on("click", function(e) {
+	    this.myDataTable.sortColumn(this.myDataTable.getColumn(1)); 
+		var request = YAHOO.util.Connect.asyncRequest('POST', matrixUrl + "?func=setSort;sort=lastUpdated");
+        },this,true);
+	}
+
+
         var myCallback = function() {
             this.set("sortedBy", null);
             this.onDataReturnAppendRows.apply(this,arguments);