[Rt-commit] rt branch, 4.0/saved-search-context, updated. rt-4.0.1-213-g88e329a

Jason May jasonmay at bestpractical.com
Tue Aug 9 12:23:17 EDT 2011


The branch, 4.0/saved-search-context has been updated
       via  88e329a4aab573f221a85ca60f4684626442bfea (commit)
       via  d0b4c69160c0c147def5079347afad7acf3d5ae5 (commit)
       via  732c80aabb6c5c847cdb482ed3de5ea29cad7fd3 (commit)
       via  afb6f84629aa3a768356973d93f6b308bf1250b1 (commit)
      from  4bc4e389cebabbb06a41bf32bcdcf737c425694c (commit)

Summary of changes:
 share/html/Elements/Tabs     |   14 +++++++++-----
 share/html/Search/Build.html |    9 +++++----
 2 files changed, 14 insertions(+), 9 deletions(-)

- Log -----------------------------------------------------------------
commit afb6f84629aa3a768356973d93f6b308bf1250b1
Author: Jason May <jasonmay at bestpractical.com>
Date:   Tue Aug 9 09:52:19 2011 -0400

    Don't use $_ directly when building the hash
    
    $_ doesn't close over, causing warnings and probably incorrect
    functionality.

diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index f41c60c..fad8862 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -580,7 +580,8 @@ my $build_admin_menu = sub {
             SavedChartSearchId => sub { $chart_id },
             (
                 map {
-                    $_ => sub { $m->request_args->{$_} || $current_search->{$_} }
+                    my $p = $_;
+                    $p => sub { $m->request_args->{$p} || $current_search->{$p} }
                 } qw(Query Format OrderBy Order Page)
             ),
             RowsPerPage => sub {

commit 732c80aabb6c5c847cdb482ed3de5ea29cad7fd3
Author: Jason May <jasonmay at bestpractical.com>
Date:   Tue Aug 9 10:17:04 2011 -0400

    Use a defined-check instead of true-false
    
    This prevents using fallback when a zero or blank string is intended.

diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index fad8862..c3d82e1 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -599,7 +599,9 @@ my $build_admin_menu = sub {
             # key => callback to avoid unnecessary work
 
             for my $param (keys %fallback_query_args) {
-                $final_query_args{$param} = $QueryArgs->{$param} || $fallback_query_args{$param}->();
+                $final_query_args{$param} = defined($QueryArgs->{$param})
+                                          ? $QueryArgs->{$param}
+                                          : $fallback_query_args{$param}->();
             }
 
             for my $field (qw(Order OrderBy)) {
diff --git a/share/html/Search/Build.html b/share/html/Search/Build.html
index ba5045b..385cafb 100644
--- a/share/html/Search/Build.html
+++ b/share/html/Search/Build.html
@@ -66,7 +66,7 @@
 %#   action does quote it (this breaks SQLite).
 %#
 <& /Elements/Header, Title => $title &>
-<& /Elements/Tabs, QueryString => $QueryString &>
+<& /Elements/Tabs, %TabArgs &>
 
 <form method="post" action="Build.html" name="BuildQuery" id="BuildQuery">
 <input type="hidden" class="hidden" name="SavedSearchId" value="<% $saved_search{'Id'} %>" />
@@ -297,12 +297,12 @@ if ( $ARGS{'DoSearch'} ) {
 
 # Build a querystring for the tabs
 
-my $QueryString = '';
+my %TabArgs = ();
 if ($NewQuery) {
-    $QueryString = 'NewQuery=1';
+    $TabArgs{QueryString} = 'NewQuery=1';
 }
 elsif ( $query{'Query'} ) {
-    $QueryString = $m->comp('/Elements/QueryString', %query );
+    $TabArgs{QueryArgs} = \%query;
 }
 
 </%INIT>

commit d0b4c69160c0c147def5079347afad7acf3d5ae5
Author: Jason May <jasonmay at bestpractical.com>
Date:   Tue Aug 9 11:12:29 2011 -0400

    Preserve the chart ID when redirecting with an error
    
    This commit address #18001.

diff --git a/share/html/Search/Build.html b/share/html/Search/Build.html
index 385cafb..db84e7d 100644
--- a/share/html/Search/Build.html
+++ b/share/html/Search/Build.html
@@ -179,6 +179,7 @@ if ( @parse_results ) {
         Query => $query{'Query'},
         Format => $query{'Format'},
         SavedSearchId => $saved_search{'Id'},
+        SavedChartSearchId => $ARGS{'SavedChartSearchId'},
         actions => \@actions,
     );
 }

commit 88e329a4aab573f221a85ca60f4684626442bfea
Author: Jason May <jasonmay at bestpractical.com>
Date:   Tue Aug 9 12:22:06 2011 -0400

    Use the correct variables for constructing the RSS link query strings

diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index c3d82e1..e2588f7 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -644,8 +644,9 @@ my $build_admin_menu = sub {
                                    spreadsheet => title => loc('Spreadsheet'),
                                    path => "/Search/Results.tsv$args" );
 
-            my %rss_data = map { $_ => $QueryArgs->{$_} || $query_args{$_} || '' }
-                           qw(Query Order OrderBy Rows);
+            my %rss_data = map {
+                $_ => $QueryArgs->{$_} || $fallback_query_args{$_}->() || '' }
+                    qw(Query Order OrderBy);
             my $RSSQueryString = "?"
                 . $query_string->( Query   => $rss_data{Query},
                                    Order   => $rss_data{Order},
@@ -672,7 +673,7 @@ my $build_admin_menu = sub {
                     search          => 1,
                     plugin          => 'Tickets',
                     'Tickets:query' => $rss_data{'Query'},
-                    'Tickets:limit' => $rss_data{'Rows'},
+                    'Tickets:limit' => $QueryArgs->{'Rows'},
                 );
 
                 $more->child( 'shredder' => title => loc('Shredder'),

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


More information about the Rt-commit mailing list