[Rt-commit] [rtir] 03/08: Don't send full search interface into the limited Refine interface.

Kevin Falcone falcone at bestpractical.com
Fri Jul 12 22:55:34 EDT 2013


This is an automated email from the git hooks/post-receive script.

falcone pushed a commit to branch 2.9/search-menus
in repository rtir.

commit 2d6eeb75f53eed5dba562505ece7e9e550366e34
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Jul 12 18:41:27 2013 -0400

    Don't send full search interface into the limited Refine interface.
    
    Refine.html hides the Queue selector, so this is terrible for the full
    search interface.
    
    I've made the decision that New Search doesn't work for the sub-search
    interfaces (such as BuilkReject and BulkAbandon) so we don't even show
    New Search there.
    
    Ensure that the Bulk UIs do get the Refine view when editing searches.
---
 html/Callbacks/RTIR/Elements/Tabs/Privileged | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/html/Callbacks/RTIR/Elements/Tabs/Privileged b/html/Callbacks/RTIR/Elements/Tabs/Privileged
index cda1975..3ee4bb2 100644
--- a/html/Callbacks/RTIR/Elements/Tabs/Privileged
+++ b/html/Callbacks/RTIR/Elements/Tabs/Privileged
@@ -404,17 +404,21 @@ if ( $request_path =~ m{^/RTIR/(?:$re_rtir_types/)?(Display|Edit|Update|Forward|
             path => "/RTIR/Search/Results.html?". $query_string->( %args ),
         );
     }
+
+    # Refine.html doesn't let you change the Queue, so don't link there from the
+    # full RTIR Search UI, only from the Bulk screens.
+    my $bulk_path = 1 if $request_path =~ m{^/RTIR/(Incident/BulkAbandon\.html$|Report/BulkReject\.html$)};
+
     PageMenu()->child(
         edit_search => title => loc('Edit Search'),
-        path => "/RTIR/Search/Refine.html?". $query_string->( %args ),
+        path => "/RTIR/Search/" .
+                    ($bulk_path ? "Refine.html?" : "?") .
+                    $query_string->( %args ),
     );
-    if ( $args{'Query'} ) {
+    if ( $args{'Query'} && !$bulk_path ) {
         PageMenu()->child(
             new_search => title => loc('New Search'),
-            path => "/RTIR/Search/Refine.html?". $query_string->(
-                NewQuery => 1,
-                Queue => $queue,
-            ),
+            path => "/RTIR/Search/?NewQuery=1"
         );
     }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Rt-commit mailing list