diff --git a/docs/upgrades/packages-7.6.4/matrix-default-detailed-listing.wgpkg b/docs/upgrades/packages-7.6.4/matrix-default-detailed-listing.wgpkg index 8342baef6..97bbf93af 100644 Binary files a/docs/upgrades/packages-7.6.4/matrix-default-detailed-listing.wgpkg and b/docs/upgrades/packages-7.6.4/matrix-default-detailed-listing.wgpkg differ diff --git a/docs/upgrades/packages-7.6.4/matrix-default-view-template.wgpkg b/docs/upgrades/packages-7.6.4/matrix-default-view-template.wgpkg index ba8109368..406163dda 100644 Binary files a/docs/upgrades/packages-7.6.4/matrix-default-view-template.wgpkg and b/docs/upgrades/packages-7.6.4/matrix-default-view-template.wgpkg differ diff --git a/lib/WebGUI/Asset/MatrixListing.pm b/lib/WebGUI/Asset/MatrixListing.pm index dae42184c..e1578e01b 100644 --- a/lib/WebGUI/Asset/MatrixListing.pm +++ b/lib/WebGUI/Asset/MatrixListing.pm @@ -534,7 +534,8 @@ sub view { if ($var->{screenshots}) { my $file = WebGUI::Form::File->new($self->session,{ value=>$var->{screenshots} }); my $storage = $file->getStorageLocation; - my @files = @{ $storage->getFiles } if (defined $storage); + my @files; + @files = @{ $storage->getFiles } if (defined $storage); $var->{screenshots} = qq| @@ -711,10 +712,10 @@ sub www_click { $self->incrementCounter('clicks'); if ($session->form->process("manufacturer")) { - $session->http->setRedirect( $self->get('manufacturerUrl') ); + $session->http->setRedirect( $self->get('manufacturerURL') ); } else { - $session->http->setRedirect( $self->get('productUrl') ); + $session->http->setRedirect( $self->get('productURL') ); } return undef; } @@ -826,7 +827,8 @@ sub www_getScreenshots { my $fileObject = WebGUI::Form::File->new($self->session,{ value=>$self->get('screenshots') }); my $storage = $fileObject->getStorageLocation; my $path = $storage->getPath; - my @files = @{ $storage->getFiles } if (defined $storage); + my @files; + @files = @{ $storage->getFiles } if (defined $storage); foreach my $file (@files) { unless ($file =~ m/^thumb-/){ my $thumb = 'thumb-'.$file; diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm index 31222048b..b97d4924c 100644 --- a/lib/WebGUI/Asset/Wobject/Matrix.pm +++ b/lib/WebGUI/Asset/Wobject/Matrix.pm @@ -1,6 +1,7 @@ package WebGUI::Asset::Wobject::Matrix; -$VERSION = "2.0.0"; +use strict; +our $VERSION = "2.0.0"; #------------------------------------------------------------------- # WebGUI is Copyright 2001-2008 Plain Black Corporation. @@ -12,7 +13,6 @@ $VERSION = "2.0.0"; # http://www.plainblack.com info@plainblack.com #------------------------------------------------------------------- -use strict; use Tie::IxHash; use JSON; use WebGUI::International; @@ -485,7 +485,7 @@ sub view { returnObjects => 1, }) }; $var->{bestCompares_url} = $bestCompares_listing->getUrl; - $var->{bestCompares_count} = $bestCompares_listing->get('views'); + $var->{bestCompares_count} = $bestCompares_listing->get('compares'); $var->{bestCompares_name} = $bestCompares_listing->get('title'); $var->{bestCompares_sortButton} = "
"; @@ -498,7 +498,7 @@ sub view { returnObjects => 1, }) }; $var->{bestClicks_url} = $bestClicks_listing->getUrl; - $var->{bestClicks_count} = $bestClicks_listing->get('views'); + $var->{bestClicks_count} = $bestClicks_listing->get('clicks'); $var->{bestClicks_name} = $bestClicks_listing->get('title'); $var->{bestClicks_sortButton} = "
"; diff --git a/lib/WebGUI/i18n/English/Asset_Matrix.pm b/lib/WebGUI/i18n/English/Asset_Matrix.pm index 28e4d3bef..5062b2d8b 100644 --- a/lib/WebGUI/i18n/English/Asset_Matrix.pm +++ b/lib/WebGUI/i18n/English/Asset_Matrix.pm @@ -183,6 +183,83 @@ our $I18N = { lastUpdated => 0, }, + 'listing statistics label' => { + message => q|Listing Statistics|, + lastUpdated => 0, + }, + + 'most clicks label' => { + message => q|Most clicks|, + lastUpdated => 0, + }, + + 'most views label' => { + message => q|Most views|, + lastUpdated => 0, + }, + + 'most compares label' => { + message => q|Most compares|, + lastUpdated => 0, + }, + + 'most recently updated label' => { + message => q|Most recently updated|, + lastUpdated => 0, + }, + + 'best rated label' => { + message => q|Best Rated By Users|, + lastUpdated => 0, + }, + + 'worst rated label' => { + message => q|Worst Rated by Users|, + lastUpdated => 0, + }, + + 'site statistics label' => { + message => q|Site Statistics|, + lastUpdated => 0, + }, + + 'listing count label' => { + message => q|Listing Count|, + lastUpdated => 0, + }, + + 'pending listings label' => { + message => q|Pending Listings|, + lastUpdated => 0, + }, + + 'add new listing label' => { + message => q|Click here to add a new listing.|, + lastUpdated => 0, + }, + + 'add new listing text' => { + message => q|Please note that you will be the official maintainer of the listing, and will be responsible +for keeping it up to date.|, + lastUpdated => 0, + }, + + 'create account part1 text' => { + message => q|If you are the maker of a product, or are an expert user and are willing to maintain the +listing,|, + lastUpdated => 0, + }, + + 'create account label' => { + message => q|create an account|, + lastUpdated => 0, + }, + + 'create account part2 text' => { + message => q|so you can register your listing.|, + lastUpdated => 0, + }, + 'isLoggedIn' => { message => q|A condition indicating whether the current user is logged in to the site.|, lastUpdated => 0,