[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.6-334-gee7ab1d
Shawn Moore
sartak at bestpractical.com
Thu Dec 2 13:11:37 EST 2010
The branch, 3.9-trunk has been updated
via ee7ab1d983b5ccc9fb84bf5a1764c059c1656e2f (commit)
from 7a7d3c0f99198a56c38820814280a2444bfc00e1 (commit)
Summary of changes:
share/html/Elements/Tabs | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
- Log -----------------------------------------------------------------
commit ee7ab1d983b5ccc9fb84bf5a1764c059c1656e2f
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Thu Dec 2 13:09:47 2010 -0500
query_form doesn't return the query_form when used as a setter
This fixes warning test fails in t/web/unlimited_search.t and
t/web/search_rss.t
diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index 8c00c09..9178eba 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -517,11 +517,17 @@ if ( $request_path !~ qr{^/SelfService/} ) {
if ($request_path =~ qr{^/Search/Results.html}
&& #XXX TODO better abstraction
$session{'CurrentUser'}->HasRight( Right => 'SuperUser', Object => $RT::System )) {
- my $shred_args = URI->new->query_form(
- search => 1,
- plugin => 'Tickets',
- 'Tickets:query' => $query_args{'Query'},
- 'Tickets:limit' => $query_args{'Rows'});
+
+ my $uri = URI->new;
+ $uri->query_form(
+ search => 1,
+ plugin => 'Tickets',
+ 'Tickets:query' => $query_args{'Query'},
+ 'Tickets:limit' => $query_args{'Rows'},
+ );
+
+ my $shred_args = $uri->query_form;
+
$current_search_menu->child( 'shredder' => title => loc('Shredder'),
path => 'Admin/Tools/Shredder/?' . $shred_args);
}
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list