[Rt-commit] [svn] r1594 - in rtir/branches/1.1-TESTING/html/RTIR: Elements Tools

[leira at pallas.eruditorum.org]

Author: leira
Date: Thu Sep 30 00:28:10 2004
New Revision: 1594

Modified:
   rtir/branches/1.1-TESTING/html/RTIR/Elements/MakeClicky
   rtir/branches/1.1-TESTING/html/RTIR/Tools/Lookup.html
Log:
RT-Ticket: 3741
RT-Status: resolved
RT-Action: correspond
It's not possible to investigate to multiple addresses from the Lookup page.


Modified: rtir/branches/1.1-TESTING/html/RTIR/Elements/MakeClicky
==============================================================================
--- rtir/branches/1.1-TESTING/html/RTIR/Elements/MakeClicky	(original)
+++ rtir/branches/1.1-TESTING/html/RTIR/Elements/MakeClicky	Thu Sep 30 00:28:10 2004
@@ -56,10 +56,13 @@
      my ($pre,$post) = split /@/,$value,2;
      my $result = qq[<A HREF="$RT::WebPath/RTIR/Tools/Lookup.html?@{[$url_params_once]}type=email&q=$value">$value</A> ];
 if ($incident) {
-      $result .= qq[[<A HREF="$RT::WebPath/RTIR/Create.html?Incident=$incident&Queue=Investigations&Requestors=$value">Investigate to</A>] ];
+    if ($r->uri =~ /Lookup.html$/) {
+	$result .= qq[<INPUT TYPE=CHECKBOX NAME="Requestorbox-$value" UNCHECKED>];
+    }
+    $result .= qq[[<A HREF="$RT::WebPath/RTIR/Create.html?Incident=$incident&Queue=Investigations&Requestors=$value">Investigate to</A>] ];
 }
-      $result .= qq[<A HREF="$RT::WebPath/RTIR/Tools/Lookup.html?@{[$url_params_once]}type=host&q=$post">($post)</A>];
-   },
+     $result .= qq[<A HREF="$RT::WebPath/RTIR/Tools/Lookup.html?@{[$url_params_once]}type=host&q=$post">($post)</A>];
+ },
    url =>
    sub {
      my ($type,$value) = @_;

Modified: rtir/branches/1.1-TESTING/html/RTIR/Tools/Lookup.html
==============================================================================
--- rtir/branches/1.1-TESTING/html/RTIR/Tools/Lookup.html	(original)
+++ rtir/branches/1.1-TESTING/html/RTIR/Tools/Lookup.html	Thu Sep 30 00:28:10 2004
@@ -142,6 +142,12 @@
 
 % if ($q) {
 <h2>WHOIS Results</h2>
+% if ($TicketObj && $TicketObj->QueueObj->Name eq 'Incidents') {
+<FORM METHOD=POST ACTION="/RTIR/Tools/ScriptedAction.html">
+<input type=hidden NAME="incidentid" VALUE=<%$TicketObj->Id%>>
+<input type=hidden NAME="Subject" VALUE="<%$TicketObj->Subject%>">
+
+% }
 % }
 % if ($error){
 <b><%$error%></b>
@@ -152,6 +158,9 @@
 %     if ($handparse || $#lines_starting_with_space >= 4) { #we couldn't parse that. suck
 %       my $content = join("", $obj->content());
 %       $m->comp( '/RTIR/Elements/MakeClicky', ticket => $TicketObj, url_params => "ticket=".$ticket."&server=$server", content => \$content);
+% if ($content =~ /Requestorbox/ig) {
+%    $DoInvestigate = 1;
+% }
 <pre><%$content|n%></pre>
 <br>
 %     } else {
@@ -168,14 +177,25 @@
 <%$value|n%><br>
 %                       }
 % }
+
+% }
 % }
 % }
+
+%# Don't offer the option of Investigating to unless there are addresses
+% if ($DoInvestigate) {
+<& /Elements/Submit, Name => "InvestigateTo", Caption => loc("Investigate to selected addresses"), Label => loc("Investigate")&>
 % }
 
+</FORM>
+
 <%init>
 my $current_subtab;
 my $TicketType;
 my $TicketObj;
+
+my $DoInvestigate;
+
 #  {{{ Set up the whois query
 if (!$server) {
   foreach my $s (sort keys %$servers) {
@@ -189,10 +209,6 @@
   }
 }
 
-$beauty = ( exists($beauties->{ ({ reverse %$servers }->{$server}) })
-      ? $beauties->{ ({ reverse %$servers }->{$server}) } ." (". $server .")"
-      : $server );
-
 my $title = loc("Lookup '[_1]' using server [_2]", $q, $server);
 
 use Net::Whois::RIPE;
@@ -248,7 +264,6 @@
 $servers => $RT::whois
 $server => undef
 $beauties => $RT::WhoisNames
-$beauty => undef
 $handparse => 1
 $q => undef
 $type => undef