[Rt-commit] rtir branch, 4.0-trunk, updated. 4.0.0-57-g3a892b4

[Shawn Moore]

The branch, 4.0-trunk has been updated
       via  3a892b460ac2ddf93469f03edc73cd2c204d5259 (commit)
       via  27257c65554f1301a56a784b117fc4e8024cf3e3 (commit)
       via  6871be6410d81b75f18745d33365d67ad1cc867e (commit)
      from  633fb3efb3e21b68ff9a5bd3a6c0583dd1c00070 (commit)

Summary of changes:
 html/RTIR/Tools/Elements/ToolResultsWhois |  7 ++++++-
 t/tools/lookup_alt_config.t               | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 t/tools/lookup_alt_config.t

- Log -----------------------------------------------------------------
commit 6871be6410d81b75f18745d33365d67ad1cc867e
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Thu Aug 3 14:39:20 2017 -0400

    Test to show error with RunWhoisRequestByDefault true and no ticket object

diff --git a/t/tools/lookup_alt_config.t b/t/tools/lookup_alt_config.t
new file mode 100644
index 0000000..a5441d0
--- /dev/null
+++ b/t/tools/lookup_alt_config.t
@@ -0,0 +1,18 @@
+use strict;
+use warnings;
+use RT::IR::Test tests => undef;
+
+RT->Config->Set('RunWhoisRequestByDefault', 1);
+
+RT::Test->started_ok;
+my $agent = default_agent();
+
+diag "Test Lookup page with RunWhoisRequestByDefault set to true";
+{
+    $agent->get_ok("/RTIR/Tools/Lookup.html", "Loaded Lookup page");
+    $agent->content_contains('Look Up Information');
+}
+
+undef $agent;
+done_testing;
+

commit 27257c65554f1301a56a784b117fc4e8024cf3e3
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Thu Aug 3 14:45:46 2017 -0400

    Confirm TicketObj is defined before checking for queue whois server
    
    The lookup page can be accessed directly from the Tools > Lookup menu,
    in which case it won't have a TicketObj. This caused an error when
    RunWhoisRequestByDefault was enabled. Check for a TicketObj before
    looking for a possible queue-level whois configuration.

diff --git a/html/RTIR/Tools/Elements/ToolResultsWhois b/html/RTIR/Tools/Elements/ToolResultsWhois
index 2e7dc96..3660cc5 100644
--- a/html/RTIR/Tools/Elements/ToolResultsWhois
+++ b/html/RTIR/Tools/Elements/ToolResultsWhois
@@ -137,7 +137,12 @@ $server => undef
 $WhoisServer = $server unless defined $WhoisServer;
 unless ($WhoisServer) {
     return unless RT->Config->Get('RunWhoisRequestByDefault');
-    $WhoisServer = $TicketObj->QueueObj->FirstCustomFieldValue('RTIR default WHOIS server') || RT::IR->FirstWhoisServer;
+
+    $WhoisServer = RT::IR->FirstWhoisServer;
+
+    if ( $TicketObj and $TicketObj->QueueObj->FirstCustomFieldValue('RTIR default WHOIS server') ){
+        $WhoisServer = $TicketObj->QueueObj->FirstCustomFieldValue('RTIR default WHOIS server');
+    }
 }
 
 return unless $q;

commit 3a892b460ac2ddf93469f03edc73cd2c204d5259
Merge: 633fb3e 27257c6
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Thu Aug 3 19:32:33 2017 +0000

    Merge branch '4.0/whois-default-on-lookup-page' into 4.0-trunk


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