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 000000000..8b1ec16dd Binary files /dev/null and b/docs/upgrades/packages-7.7.3/matrix-default-detailed-listing.wgpkg differ 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');