| ".$field->{label}." | ";
$fieldOptions .= WebGUI::Form::checkbox($self->session, {
@@ -3340,9 +3351,7 @@ sub getSearchTemplateVars {
$currentUrl = $session->url->append($currentUrl, $form.'='.$param);
}
- $fields = $session->db->read('select * from Thingy_fields where assetId =
-'.$session->db->quote($self->get("assetId")).' and thingId = '.$session->db->quote($thingId).' order by
-sequenceNumber');
+ $fields = $self->getFields($thingId);
while (my $field = $fields->hashRef) {
if ($field->{searchIn}){
my $searchForm = $self->getFormPlugin($field, 1);
@@ -3395,7 +3404,8 @@ sequenceNumber');
}
$query .= join(", ",map {$dbh->quote_identifier('field_'.$_->{fieldId})} @displayInSearchFields);
$query .= " from ".$dbh->quote_identifier("Thingy_".$thingId);
- if($session->form->process('func') eq 'search'){
+ my $func = $session->form->process('func');
+ if( $func eq 'search' || $func eq 'searchViaAjax' ){
# Don't add constraints when the search screen is displayed as an 'after save' option.
$query .= " where ".join(" and ",@constraints) if (scalar(@constraints) > 0);
}
@@ -3408,9 +3418,6 @@ sequenceNumber');
$noFields = 1;
}
- # store query in cache for thirty minutes
- WebGUI::Cache->new($self->session,"query_".$thingId)->set($query,30*60);
-
$paginatePage = $self->session->form->param('pn') || 1;
$currentUrl = $self->session->url->append($currentUrl, "orderBy=".$orderBy) if $orderBy;
@@ -3418,7 +3425,7 @@ sequenceNumber');
my @visibleResults;
if (! $noFields) {
- my $sth = $self->session->db->read($query) if ! $noFields;
+ my $sth = $self->session->db->read($query);
while (my $result = $sth->hashRef){
if ($self->canViewThingData($thingId,$result->{thingDataId})){
push(@visibleResults,$result);
diff --git a/t/Asset/Wobject/Thingy/getSearchTemplateVars.t b/t/Asset/Wobject/Thingy/getSearchTemplateVars.t
new file mode 100644
index 000000000..6ad2df58f
--- /dev/null
+++ b/t/Asset/Wobject/Thingy/getSearchTemplateVars.t
@@ -0,0 +1,123 @@
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2009 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com info@plainblack.com
+#-------------------------------------------------------------------
+
+use FindBin;
+use strict;
+use lib "$FindBin::Bin/../../../lib";
+
+##The goal of this test is to test getSearchTemplateVariables
+
+use WebGUI::Test;
+use WebGUI::Session;
+use Test::More tests => 6; # increment this value for each test you create
+use Test::Deep;
+use JSON;
+use WebGUI::Asset::Wobject::Thingy;
+use WebGUI::Search;
+use WebGUI::Search::Index;
+use Data::Dumper;
+
+my $session = WebGUI::Test->session;
+
+# Do our work in the import node
+my $node = WebGUI::Asset->getImportNode($session);
+
+my $versionTag = WebGUI::VersionTag->getWorking($session);
+$versionTag->set({name=>"Thingy Test"});
+WebGUI::Test->addToCleanup($versionTag);
+my $thingy = $node->addChild({
+ className => 'WebGUI::Asset::Wobject::Thingy',
+ groupIdView => 7,
+ url => 'some_thing',
+});
+is $session->db->quickScalar('select count(*) from assetIndex where assetId=?',[$thingy->getId]), 0, 'no records yet';
+$versionTag->commit;
+$thingy = $thingy->cloneFromDb;
+
+# Test indexThing, without needing a real thing
+my $groupIdEdit = $thingy->get("groupIdEdit");
+my %thingProperties = (
+ thingId => "THING_RECORD",
+ label => 'Label',
+ editScreenTitle => 'Edit',
+ editInstructions => 'instruction_edit',
+ groupIdAdd => $groupIdEdit,
+ groupIdEdit => $groupIdEdit,
+ saveButtonLabel => 'save',
+ afterSave => 'searchThisThing',
+ editTemplateId => "ThingyTmpl000000000003",
+ groupIdView => '7',
+ viewTemplateId => "ThingyTmpl000000000002",
+ defaultView => 'searchThing',
+ searchScreenTitle => 'Search',
+ searchDescription => 'description_search',
+ groupIdSearch => '7',
+ groupIdExport => $groupIdEdit,
+ groupIdImport => $groupIdEdit,
+ searchTemplateId => "ThingyTmpl000000000004",
+ thingsPerPage => 25,
+);
+my $thingId = $thingy->addThing(\%thingProperties);
+%thingProperties = %{ $thingy->getThing($thingId) };
+
+my $field1Id = $thingy->addField({
+ thingId => $thingId,
+ fieldId => "new",
+ label => "textual",
+ dateCreated => time(),
+ fieldType => "text",
+ status => "editable",
+ display => 1,
+ searchIn => 1,
+ displayInSearch => 1,
+}, 0);
+
+is $thingy->getThings->rows, 1, 'Thingy has 1 thing';
+
+my $fields = $session->db->quickScalar('select count(*) from Thingy_fields where assetId=? and thingId=?',[$thingy->getId, $thingId]);
+is $fields, '1', 'Thingy has 1 field';
+
+$thingy->editThingDataSave($thingId, 'new', {
+ thingDataId => 'new',
+ "field_$field1Id" => 'texty',
+});
+
+$thingy->editThingDataSave($thingId, 'new', {
+ thingDataId => 'new',
+ "field_$field1Id" => 'crusty',
+});
+
+$session->request->setup_body({
+ thingId => $thingId,
+});
+
+my $vars;
+$vars = $thingy->getSearchTemplateVars();
+my @results;
+@results = map { $_->{searchResult_field_loop}->[0]->{field_value} } @{ $vars->{searchResult_loop} };
+cmp_bag(\@results, [qw/texty crusty/], 'with no func set, returns all data');
+
+$session->request->setup_body({
+ thingId => $thingId,
+ func => 'search',
+ 'field_'.$field1Id => 'texty',
+});
+$vars = $thingy->getSearchTemplateVars();
+@results = map { $_->{searchResult_field_loop}->[0]->{field_value} } @{ $vars->{searchResult_loop} };
+cmp_bag(\@results, [qw/texty/], 'with no func=search, returns only what we searched for');
+
+$session->request->setup_body({
+ thingId => $thingId,
+ func => 'searchViaAjax',
+ 'field_'.$field1Id => 'crusty',
+});
+$vars = $thingy->getSearchTemplateVars();
+@results = map { $_->{searchResult_field_loop}->[0]->{field_value} } @{ $vars->{searchResult_loop} };
+cmp_bag(\@results, [qw/crusty/], 'with no func=searchViaAjax, returns only what we searched for');
|