oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bad escaping of dashes for element Ids in the Matrix. Fixes bug #11588.

Browse source
This commit is contained in:
Colin Kuskie 2010-08-03 11:03:00 -07:00
parent f3eb5efc2b
commit 6a9b6642d2
3 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -2,6 +2,7 @@
- fixed #11755: New cart does not update shipping methods correctly - fixed #11755: New cart does not update shipping methods correctly
- fixed #11757: Update the USPS International driver for new country names - fixed #11757: Update the USPS International driver for new country names
- fixed #11753: PayPal Plugin - Shipping not factored into total in paypal - fixed #11753: PayPal Plugin - Shipping not factored into total in paypal
- fixed #11588: CMSmatrix - Comparing certain products ends in data errors
7.9.10 7.9.10
- fixed #11721: spamStopWords not in WebGUI.conf.original - fixed #11721: spamStopWords not in WebGUI.conf.original

BIN
docs/upgrades/packages-7.9.11/root_import_matrix.wgpkg Normal file
View file

Binary file not shown.

5
lib/WebGUI/Asset/Wobject/Matrix.pm
View file

@ -1176,7 +1176,6 @@ sub www_getCompareFormData {
$parameter->{value} = $form->process($param); $parameter->{value} = $form->process($param);
my $attributeId = $param; my $attributeId = $param;
$attributeId =~ s/^search_//; $attributeId =~ s/^search_//;
$attributeId =~ s/_____/-/g;
$parameter->{attributeId} = $attributeId; $parameter->{attributeId} = $attributeId;
push(@searchParamList, $db->quote($parameter->{attributeId}) ); push(@searchParamList, $db->quote($parameter->{attributeId}) );
push(@searchParams, $parameter); push(@searchParams, $parameter);
@ -1228,20 +1227,17 @@ sub www_getCompareFormData {
$checked = 'checked'; $checked = 'checked';
} }
} }
$result->{assetId} =~ s/-/_____/g;
push @results, $result if $checked eq 'checked'; push @results, $result if $checked eq 'checked';
} }
} }
else { else {
foreach my $result (@{$self->getListings}) { foreach my $result (@{$self->getListings}) {
$result->{assetId} =~ s/-/_____/g;
push @results, $result; push @results, $result;
} }
} }
} }
else { else {
foreach my $result (@{$self->getListings}) { foreach my $result (@{$self->getListings}) {
$result->{assetId} =~ s/-/_____/g;
if(WebGUI::Utility::isIn($result->{assetId},@listingIds)){ if(WebGUI::Utility::isIn($result->{assetId},@listingIds)){
$result->{checked} = 'checked'; $result->{checked} = 'checked';
} }
@ -1286,7 +1282,6 @@ sub www_getCompareListData {
my @responseFields = ("attributeId", "name", "description","fieldType", "checked"); my @responseFields = ("attributeId", "name", "description","fieldType", "checked");
foreach my $listingId (@listingIds){ foreach my $listingId (@listingIds){
$listingId =~ s/_____/-/g;
my $listing = WebGUI::Asset::MatrixListing->new($session,$listingId); my $listing = WebGUI::Asset::MatrixListing->new($session,$listingId);
$listing->incrementCounter("compares"); $listing->incrementCounter("compares");
my $listingId_safe = $listingId; my $listingId_safe = $listingId;