From 87abb7933130b3497b23c9145aa41c950713f6db Mon Sep 17 00:00:00 2001
From: Yung Han Khoe <yung@webgui-svn>
Date: Wed, 8 Apr 2009 19:35:14 +0000
Subject: [PATCH] fixed #10110: Matrix 2.0 - "Data Error" on Pending Product
 Listing Updates

---
 docs/changelog/7.x.x.txt                         |   2 ++
 .../matrix-default-detailed-listing.wgpkg        | Bin 0 -> 2024 bytes
 lib/WebGUI/Asset/MatrixListing.pm                |   4 ++++
 www/extras/wobject/Matrix/matrixListing.js       |   3 +++
 4 files changed, 9 insertions(+)
 create mode 100644 docs/upgrades/packages-7.7.3/matrix-default-detailed-listing.wgpkg

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 68d80b28d..9c2e7bcab 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -2,6 +2,8 @@
  - fixed #10094: double explanation in thread help
  - rfe #9612: Carousel Wobject (was Widget Wobject) (SDH Consulting Group)
  - Survey summaries now added.  In the Survey edit, select quiz mode, and a summary will be shown to the user at the end of the survey.
+ - fixed #10110: Matrix 2.0 - "Data Error" on Pending Product Listing Updates
+
 7.7.2
  - fixed #10056: YUI javascripts included while adminOff (BNC)
  - fixed a bug that required you to hit "update cart" before the checkout
diff --git a/docs/upgrades/packages-7.7.3/matrix-default-detailed-listing.wgpkg b/docs/upgrades/packages-7.7.3/matrix-default-detailed-listing.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..8b1ec16ddb71a0e5c39c24e753099ed448627f43
GIT binary patch
literal 2024
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
GAOHYUPvJ`d

literal 0
HcmV?d00001

diff --git a/lib/WebGUI/Asset/MatrixListing.pm b/lib/WebGUI/Asset/MatrixListing.pm
index 9a14d0111..0bbd6acb2 100644
--- a/lib/WebGUI/Asset/MatrixListing.pm
+++ b/lib/WebGUI/Asset/MatrixListing.pm
@@ -640,6 +640,10 @@ sub view {
     $var->{manufacturerUrl_click}  = $self->getUrl("func=click;manufacturer=1");
     $var->{productUrl_click}       = $self->getUrl("func=click");
 
+    if($self->get('status') eq 'pending'){
+        $var->{revision}        = $self->get('revisionDate');
+    }
+
     $self->session->style->setScript($self->session->url->extras('yui/build/yahoo/yahoo-min.js'),
         {type => 'text/javascript'});
     $self->session->style->setScript($self->session->url->extras('yui/build/dom/dom-min.js'),
diff --git a/www/extras/wobject/Matrix/matrixListing.js b/www/extras/wobject/Matrix/matrixListing.js
index 6651cafd7..8d87a4b58 100644
--- a/www/extras/wobject/Matrix/matrixListing.js
+++ b/www/extras/wobject/Matrix/matrixListing.js
@@ -44,6 +44,9 @@ YAHOO.util.Event.addListener(window, "load", function() {
         };
 
 	var uri = "func=getAttributes";
+    if(typeof(revision) != 'undefined'){
+        uri = uri + ';revision=' + revision;
+    }
 
 	var initAttributeHoverHelp = function() {
 		initHoverHelp('attributes');