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

[Shawn Moore]

The branch, 4.0/search-tabs has been updated
       via  0848abad797c76ecc83bcbd99945daf8109cd9d3 (commit)
       via  e6c951215b3477743ffff033c2eb7d5e195e5471 (commit)
      from  81135bb30938375ecd47ec89151dc9b90c266958 (commit)

Summary of changes:
 share/html/Elements/Tabs     |    2 +-
 share/html/Search/Build.html |    2 +-
 t/web/search_tabs.t          |   35 +++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 t/web/search_tabs.t

- Log -----------------------------------------------------------------
commit e6c951215b3477743ffff033c2eb7d5e195e5471
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Fri Mar 11 14:22:57 2011 -0500

    Add a failing test for #16841

diff --git a/t/web/search_tabs.t b/t/web/search_tabs.t
new file mode 100644
index 0000000..3cd8f8b
--- /dev/null
+++ b/t/web/search_tabs.t
@@ -0,0 +1,35 @@
+#!/usr/bin/perl
+
+use strict;
+
+use RT::Test tests => 7;
+my ($baseurl, $agent) = RT::Test->started_ok;
+
+my $ticket = RT::Ticket->new(RT->SystemUser);
+for ( 1 .. 2 ) {
+    $ticket->Create(
+        Subject   => 'Ticket ' . $_,
+        Queue     => 'General',
+        Owner     => 'root',
+        Requestor => 'clownman at localhost',
+    );
+}
+
+ok $agent->login('root', 'password'), 'logged in as root';
+
+$agent->get_ok('/Search/Build.html');
+
+$agent->form_name('BuildQuery');
+$agent->field('idOp', '=');
+$agent->field('ValueOfid', '1');
+$agent->submit('AddClause');
+
+$agent->form_name('BuildQuery');
+$agent->field('idOp', '=');
+$agent->field('ValueOfid', '2');
+$agent->field('AndOr', 'OR');
+$agent->submit('AddClause');
+
+$agent->follow_link_ok({id => 'page-results'});
+$agent->title_is('Found 2 tickets');
+

commit 0848abad797c76ecc83bcbd99945daf8109cd9d3
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Mon Mar 14 15:35:59 2011 -0400

    Provide and use the built QueryString

diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index fb59248..e8fc3a0 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -591,7 +591,7 @@ my $build_admin_menu = sub {
             }
         }
 
-        $args = "?" . $query_string->(%query_args);
+        $args = "?" . ($m->notes('QueryString') || $query_string->(%query_args));
 
 
         my $current_search_menu;
diff --git a/share/html/Search/Build.html b/share/html/Search/Build.html
index 494bdcf..f34c280 100644
--- a/share/html/Search/Build.html
+++ b/share/html/Search/Build.html
@@ -309,7 +309,7 @@ elsif ( $query{'Query'} ) {
     $QueryString = $m->comp('/Elements/QueryString', %query );
 }
 
-
+$m->notes(QueryString => $QueryString);
 </%INIT>
 
 <%ARGS>

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