[Rt-commit] rt branch, master, updated. rt-4.1.8-548-g71eea76

[Alex Vandiver]

The branch, master has been updated
       via  71eea76bbebabab7cee4c11dd73e99154ab1af1c (commit)
       via  21a33403b64f5fab75241a8e38a19ce9d15e10ac (commit)
       via  29fe5dedfa6bcf7ec573094e25c87f5311fed664 (commit)
      from  261ae056ae52024f32cf4bfebd550a81e5e02ad9 (commit)

Summary of changes:
 share/html/Search/Bulk.html    | 4 +---
 share/html/Search/Results.html | 8 +++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit 71eea76bbebabab7cee4c11dd73e99154ab1af1c
Merge: 261ae05 21a3340
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Jun 5 14:29:51 2013 -0400

    Merge branch '4.2/preserve-saved-search-id'
    
    Conflicts:
    	share/html/Search/Results.html

diff --cc share/html/Search/Results.html
index 24480ac,6b72a89..d2856e9
--- a/share/html/Search/Results.html
+++ b/share/html/Search/Results.html
@@@ -69,10 -62,11 +69,12 @@@
      Page => $Page,
      Format => $Format,
      Class => 'RT::Tickets',
-     BaseURL => $BaseURL
- 
-    &>
+     BaseURL => $BaseURL,
+     SavedSearchId => $ARGS{'SavedSearchId'},
+     SavedChartSearchId => $ARGS{'SavedChartSearchId'},
+     PassArguments => [qw(Query Format Rows Page Order OrderBy SavedSearchId SavedChartSearchId)],
+ &>
 +% }
  % $m->callback( ARGSRef => \%ARGS, CallbackName => 'AfterResults' );
  
  % my %hiddens = (Query => $Query, Format => $Format, Rows => $Rows, OrderBy => $OrderBy, Order => $Order, HideResults => $HideResults, Page => $Page, SavedChartSearchId => $SavedChartSearchId );

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