[Rt-commit] rt branch, 4.0/missing-simple-search-page-menu, updated. rt-4.0.2-27-g10ba4af

[? sunnavy]

The branch, 4.0/missing-simple-search-page-menu has been updated
       via  10ba4afd3cdb4eab3bd5a39b973b8c12283d0af0 (commit)
      from  bf633665c380d3985f2677e8c4e95b02c6c97ab9 (commit)

Summary of changes:
 share/html/Elements/Tabs |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 10ba4afd3cdb4eab3bd5a39b973b8c12283d0af0
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Aug 30 08:47:05 2011 +0800

    tweak code to make the logic clear

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

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