From f9424897876a4510b2389603a0f3b1947909731f Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 17 Aug 2009 18:35:53 +0000
Subject: [PATCH] Clean-up Matrix search template JS. Add link back to main
 matrix screen. Make initial search results match search form defaults. fixes
 #10766, 10786

---
 docs/changelog/7.x.x.txt                      |   1 +
 .../matrix-search-template.wgpkg              | Bin 0 -> 3688 bytes
 lib/WebGUI/Asset/Wobject/Matrix.pm            |  20 ++++++++++++++++--
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 docs/upgrades/packages-7.7.18/matrix-search-template.wgpkg

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 12364bce2..5ce75a762 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.7.18
+ - fixed #10766: Matrix search: search dropdowns do not match what is displayed when search form opens.
  - fixed #10783: Inbox Copy Sender broken
  - fixed #10782: Send Message friend_wholeName template var
  - fixed #10778: Matrix navigation: list attributes
diff --git a/docs/upgrades/packages-7.7.18/matrix-search-template.wgpkg b/docs/upgrades/packages-7.7.18/matrix-search-template.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..165c6791a1cd3a111159489956d1c73ad7c4ecc1
GIT binary patch
literal 3688
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
GH~;`kIv-R3

literal 0
HcmV?d00001

diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm
index 6b96df517..13ed6b3cc 100644
--- a/lib/WebGUI/Asset/Wobject/Matrix.pm
+++ b/lib/WebGUI/Asset/Wobject/Matrix.pm
@@ -1160,6 +1160,7 @@ sub www_getCompareFormData {
     my @listingIds = $session->form->checkList("listingId");
     
     $session->http->setMimeType("application/json");
+    my $db = $session->db;
 
     my (@searchParams,@searchParams_sorted,@searchParamList,$searchParamList);
     if($form->process("search")){
@@ -1172,8 +1173,23 @@ sub www_getCompareFormData {
                 $attributeId =~ s/^search_//;
                 $attributeId =~ s/_____/-/g;
                 $parameter->{attributeId} = $attributeId;
-                push(@searchParamList,'"'.$parameter->{attributeId}.'"');
-                push(@searchParams,$parameter);
+                push(@searchParamList,  $db->quote($parameter->{attributeId}) );
+                push(@searchParams,     $parameter);
+            }
+        }
+        if (! scalar @searchParamList) {
+            ##Use defaults for all form values
+            foreach my $category (keys %{$self->getCategories}) {
+                my $attributes = $db->read("select * from Matrix_attribute where category =? and assetId = ?",
+                    [$category,$self->getId]);
+                while (my $attribute = $attributes->hashRef) {
+                    push @searchParamList, $db->quote($attribute->{attributeId});
+                    push @searchParams, {
+                        name        => $attribute->{name},
+                        value       => $attribute->{defaultValue},
+                        attributeId => $attribute->{attributeId},
+                    };
+                }
             }
         }
         $searchParamList        = join(',',@searchParamList);