[Rt-commit] rt branch, 4.0/saved-search-context, created. rt-4.0.1-205-g75057d9

[Thomas Sibley]

The branch, 4.0/saved-search-context has been created
        at  75057d962d4cfcbf3ac5a2d39c9dc4e47f970d7e (commit)

- Log -----------------------------------------------------------------
commit 75057d962d4cfcbf3ac5a2d39c9dc4e47f970d7e
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Jul 29 14:41:23 2011 -0400

    $search is a menu object, $current_search is the hash from the session
    
    Unfortunately this doesn't fix half of the woes with losing saved search
    context because /Search/Build.html passes $QueryString into
    /Elements/Tabs which overrides the values we intuit from request args
    and the session.

diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index 865aace..a7ac54d 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -569,7 +569,7 @@ my $build_admin_menu = sub {
         my $args      = '';
         my $has_query = '';
         my $current_search = $session{"CurrentSearchHash"} || {};
-        my $search_id = $m->request_args->{'SavedSearchLoad'} || $m->request_args->{'SavedSearchId'} || $search->{'SearchId'} || '';
+        my $search_id = $m->request_args->{'SavedSearchLoad'} || $m->request_args->{'SavedSearchId'} || $current_search->{'SearchId'} || '';
 
         $has_query = 1 if ( $m->request_args->{'Query'} or $current_search->{'Query'} );
 

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