[Rt-commit] rt branch, 4.0/missing-simple-search-page-menu, created. rt-4.0.2-26-gbf63366

[? sunnavy]

The branch, 4.0/missing-simple-search-page-menu has been created
        at  bf633665c380d3985f2677e8c4e95b02c6c97ab9 (commit)

- Log -----------------------------------------------------------------
commit da71990c74342f5370bf54408f86f1bf5d1bf2b9
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Aug 22 05:40:59 2011 +0800

    show same page menu in simple search as in normal search if there is query

diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index ff2055b..f4e8ce91 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -571,7 +571,7 @@ my $build_admin_menu = sub {
             }
         }
     }
-    if ( $request_path =~ m{^/(?:Ticket|Search)/} && $request_path !~ m{^/Search/Simple\.html}) {
+    if ( $request_path =~ m{^/(?!Search/Simple\.html)(?:Ticket|Search)/} || $request_path =~ m{^/Search/Simple\.html} && $m->request_args->{'q'} ) {
         my $search = Menu()->child('search');
         my $args      = '';
         my $has_query = '';

commit bf633665c380d3985f2677e8c4e95b02c6c97ab9
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Aug 22 06:29:54 2011 +0800

    test page menu of simple search

diff --git a/t/web/search_simple.t b/t/web/search_simple.t
new file mode 100644
index 0000000..1efc9a5
--- /dev/null
+++ b/t/web/search_simple.t
@@ -0,0 +1,22 @@
+use strict;
+use warnings;
+
+use RT::Test tests => 16;
+my ( $baseurl, $m ) = RT::Test->started_ok;
+
+RT::Test->create_tickets(
+    { Queue   => 'General' },
+    { Subject => 'ticket foo' },
+    { Subject => 'ticket bar' },
+);
+
+ok( $m->login, 'logged in' );
+
+$m->get_ok('/Search/Simple.html');
+$m->content_lacks( 'Show Results', 'no page menu' );
+$m->get_ok('/Search/Simple.html?q=ticket foo');
+$m->content_contains( 'Show Results',   "has page menu" );
+$m->title_is( 'Found 1 ticket', 'title' );
+$m->content_contains( 'ticket foo', 'has ticket foo' );
+
+# TODO more simple search tests

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