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

Do not highlight checkboxes when returning search results. Fixes bug #11150

Browse source
This commit is contained in:
Colin Kuskie 2009-10-21 12:58:58 -07:00
parent 365d4bfef2
commit 13f833c27b
2 changed files with 5 additions and 6 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 #11074: Links to CS posts not working - fixed #11074: Links to CS posts not working
- fixed #11152: Image edits do not autocommit version tags - fixed #11152: Image edits do not autocommit version tags
- fixed template attachments are not cleaned up during purge - fixed template attachments are not cleaned up during purge
- fixed #11150: matrix - search boxes all ticked
7.8.2 7.8.2
- Added scheduled vendor payout workflow activity. (Special thanks to Martin @ Oqapi) - Added scheduled vendor payout workflow activity. (Special thanks to Martin @ Oqapi)

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

@ -1193,6 +1193,7 @@ sub www_getCompareFormData {
if($form->process("search")) { if($form->process("search")) {
if ($searchParamList) { if ($searchParamList) {
RESULT: foreach my $result (@{$self->getListings}) { RESULT: foreach my $result (@{$self->getListings}) {
my $checked = '';
my $matrixListing_attributes = $session->db->buildHashRefOfHashRefs(" my $matrixListing_attributes = $session->db->buildHashRefOfHashRefs("
select value, fieldType, attributeId from Matrix_attribute select value, fieldType, attributeId from Matrix_attribute
left join MatrixListing_attribute as listing using(attributeId) left join MatrixListing_attribute as listing using(attributeId)
@ -1203,24 +1204,21 @@ sub www_getCompareFormData {
my $fieldType = $matrixListing_attributes->{$param->{attributeId}}->{fieldType}; my $fieldType = $matrixListing_attributes->{$param->{attributeId}}->{fieldType};
my $listingValue = $matrixListing_attributes->{$param->{attributeId}}->{value}; my $listingValue = $matrixListing_attributes->{$param->{attributeId}}->{value};
if(($fieldType eq 'MatrixCompare') && ($listingValue < $param->{value})){ if(($fieldType eq 'MatrixCompare') && ($listingValue < $param->{value})){
$result->{checked} = '';
last PARAM; last PARAM;
} }
elsif(($fieldType ne 'MatrixCompare' && $fieldType ne '') && ($param->{value} ne $listingValue)){ elsif(($fieldType ne 'MatrixCompare' && $fieldType ne '') && ($param->{value} ne $listingValue)){
$result->{checked} = '';
last PARAM; last PARAM;
} }
else{ else{
$result->{checked} = 'checked'; $checked = 'checked';
} }
} }
$result->{assetId} =~ s/-/_____/g; $result->{assetId} =~ s/-/_____/g;
push @results, $result if $result->{checked} eq 'checked'; push @results, $result if $checked eq 'checked';
} }
} }
else { else {
foreach my $result (@{$self->getListings}) { foreach my $result (@{$self->getListings}) {
$result->{checked} = 'checked';
$result->{assetId} =~ s/-/_____/g; $result->{assetId} =~ s/-/_____/g;
push @results, $result; push @results, $result;
} }
@ -1390,7 +1388,7 @@ sub www_listAttributes {
=head2 www_search ( ) =head2 www_search ( )
Returns the search screen. Returns the search screen. Uses www_getCompareFormData with search=1 for doing AJAX requests.
=cut =cut