[Rt-commit] rt branch, 4.0/search-tabs, updated. rt-4.0.0rc6-32-gd906284

[Shawn Moore]

The branch, 4.0/search-tabs has been updated
       via  d9062846f8b7f8a6d382f40f3e8614034f5a58d6 (commit)
      from  48ba3468a1e6b349943c68ea3826db7cc5940423 (commit)

Summary of changes:
 share/html/Search/Build.html            |    3 ++-
 share/html/Search/Elements/EditSearches |    6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit d9062846f8b7f8a6d382f40f3e8614034f5a58d6
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Mon Mar 14 14:56:37 2011 -0400

    Provide QueryString to caller of EditSearches instead of dropping it

diff --git a/share/html/Search/Build.html b/share/html/Search/Build.html
index 6cce850..9ea4937 100644
--- a/share/html/Search/Build.html
+++ b/share/html/Search/Build.html
@@ -109,7 +109,7 @@
 <%INIT>
 my $title = loc("Query Builder");
 
-my (%saved_search, %query, $optionlist, %cfqueues, $AvailableColumns, $CurrentFormat);
+my (%saved_search, %query, $optionlist, %cfqueues, $AvailableColumns, $CurrentFormat, $QueryString);
 my @actions = $m->comp('Elements/EditSearches:Regenerate',
     %ARGS,
     saved_search       => \%saved_search,
@@ -119,6 +119,7 @@ my @actions = $m->comp('Elements/EditSearches:Regenerate',
     AvailableColumns   => \$AvailableColumns,
     CurrentFormat      => \$CurrentFormat,
     SavedChartSearchId => \$SavedChartSearchId,
+    QueryString        => \$QueryString,
 );
 
 </%INIT>
diff --git a/share/html/Search/Elements/EditSearches b/share/html/Search/Elements/EditSearches
index c87a1b4..cde428f 100644
--- a/share/html/Search/Elements/EditSearches
+++ b/share/html/Search/Elements/EditSearches
@@ -333,6 +333,7 @@ $cfqueues
 $AvailableColumns
 $CurrentFormat
 $SavedChartSearchId
+$QueryString
 </%ARGS>
 <%INIT>
 use RT::Interface::Web::QueryBuilder;
@@ -524,12 +525,11 @@ if ( $ARGS{'DoSearch'} ) {
 
 # Build a querystring for the tabs
 
-my $QueryString = '';
 if ($NewQuery) {
-    $QueryString = 'NewQuery=1';
+    $$QueryString = 'NewQuery=1';
 }
 elsif ( $query->{'Query'} ) {
-    $QueryString = $m->comp('/Elements/QueryString', %$query );
+    $$QueryString = $m->comp('/Elements/QueryString', %$query );
 }
 
 return @actions;

-----------------------------------------------------------------------