[Rt-commit] rtir branch, 4.0.1-releng, updated. 4.0.1rc1-4-g83aafff

[Shawn Moore]

The branch, 4.0.1-releng has been updated
       via  83aafffc136ab06ef34dc205a30219ca94e86157 (commit)
      from  ef8c7139af56779e05db5cd4ff621d8c00b9286e (commit)

Summary of changes:
 etc/RTIR_Config.pm                              | 10 ++++++++++
 html/Callbacks/RTIR/Search/Results.html/Initial |  1 +
 2 files changed, 11 insertions(+)

- Log -----------------------------------------------------------------
commit 83aafffc136ab06ef34dc205a30219ca94e86157
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Thu Aug 31 16:16:19 2017 -0400

    Make the RTIR search redirect configurable
    
    Some RTIR users prefer to use the RT search interface when
    searching for tickets. Provide a configuration option to disable
    the automatic redirect from the RT search to the RTIR search.

diff --git a/etc/RTIR_Config.pm b/etc/RTIR_Config.pm
index dfeb340..b053447 100644
--- a/etc/RTIR_Config.pm
+++ b/etc/RTIR_Config.pm
@@ -289,6 +289,16 @@ Home page.
 
 Set($RTIR_RedirectOnLogin, 1);
 
+=item C<$RTIR_RedirectOnSearch>
+
+If set to a true value, searches initiated on the RT search page
+that contain RTIR-related queues will redirect to the RTIR search
+page. The default is true.
+
+=cut
+
+Set($RTIR_RedirectOnSearch, 1);
+
 =item DefaultQueue
 
 By default, RT does not specify a Default Queue.
diff --git a/html/Callbacks/RTIR/Search/Results.html/Initial b/html/Callbacks/RTIR/Search/Results.html/Initial
index 281cfcd..d19634b 100644
--- a/html/Callbacks/RTIR/Search/Results.html/Initial
+++ b/html/Callbacks/RTIR/Search/Results.html/Initial
@@ -49,6 +49,7 @@
 $ARGSRef => {}
 </%ARGS>
 <%INIT>
+return unless RT->Config->Get('RTIR_RedirectOnSearch');
 
 # this callback redirects search results from a standard 
 # RT search results page to the RTIR search results page

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