[Rt-commit] r5203 - in rtir/branches/1.9-EXPERIMENTAL: html/RTIR/Tools

[ruz at bestpractical.com]

Author: ruz
Date: Thu May 11 06:56:39 2006
New Revision: 5203

Modified:
   rtir/branches/1.9-EXPERIMENTAL/   (props changed)
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Lookup.html

Log:
 r1419 at cubic-pc:  cubic | 2006-05-11 14:56:51 +0400
 * don't forget about 'WebPath/...' prefix
 * minor changes


Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Lookup.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Lookup.html	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Lookup.html	Thu May 11 06:56:39 2006
@@ -33,7 +33,7 @@
 <& /Widgets/TitleBoxStart, title => loc("Current [_1]: #[_2]", $TicketType, $ticket), color=> "#993333" &>
 <table width="100%" border="0" cellpadding="2" cellspacing="0">
 <& /Elements/TicketList, 
-    Query  => "id = ".$TicketObj->id,
+    Query  => "id = $ticket",
     Format => $Format,
 &>
 </table><hr />
@@ -149,10 +149,10 @@
 
 % 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 ( $TicketObj && $TicketType eq 'Incident' ) {
+<form method="post" action="<% RT->Config->Get('WebPath') %>/RTIR/Tools/ScriptedAction.html">
+<input type="hidden" name="incidentid" value="<% $ticket %>" />
+<input type="hidden" name="Subject" value="<% $TicketObj->Subject %>" />
 
 % }
 % }
@@ -260,9 +260,11 @@
     $RT::Logger->warning( $msg ) unless $val;
 }
 
-if ($ticket) {
-  ($TicketType, undef) = $m->comp('/RTIR/Elements/Type', Ticket => $ticket);
-  $TicketObj = LoadTicket($ticket);
+if ( $ticket ) {
+    $TicketObj = LoadTicket($ticket);
+    $ticket = $ARGS{'ticket'} = $TicketObj->id;
+
+    ($TicketType) = $m->comp('/RTIR/Elements/Type', TicketObj => $TicketObj);
 }
 
 my $Format = RT->Config->Get('RTIRSearchResultFormats')->{$TicketType . 'Default'};