[Rt-commit] r4967 - in rtir/branches/1.9-EXPERIMENTAL: html/RTIR html/RTIR/Search/Elements

[ruz at bestpractical.com]

Author: ruz
Date: Tue Apr  4 14:42:35 2006
New Revision: 4967

Modified:
   rtir/branches/1.9-EXPERIMENTAL/   (props changed)
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Create.html
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ShowResults
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html

Log:
 r1237 at cubic-pc:  cubic | 2006-04-04 21:13:07 +0400
 * drop unint warnings


Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Create.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Create.html	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Create.html	Tue Apr  4 14:42:35 2006
@@ -394,11 +394,11 @@
 $m->comp( 'SELF:ProcessAttachments', %ARGS );
 
 my @results;
-if ( !$ARGS{'AddAttachment'} && $ARGS{'id'} eq 'new' ) {
+if ( !$ARGS{'AddAttachment'} && ($ARGS{'id'} || '') eq 'new' ) {
     if ( $Type ne 'Investigation' || $ARGS{'Requestors'} ) {
         return $m->comp( 'Display.html', %ARGS );
     } else {
-        push @results, loc( "Investigation launch failed: You must enter a correspondent.");
+        push @results, loc( "Investigation launch failed: You must enter a correspondent." );
     }
 }
 

Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ShowResults
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ShowResults	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ShowResults	Tue Apr  4 14:42:35 2006
@@ -61,8 +61,8 @@
 
 $OrderBy = join "|", @{$OrderBy} if ref $OrderBy;
 $Order   = join "|", @{$Order}   if ref $Order;
-if ( $OrderBy ne $session{'CurrentSearchHash'}->{'OrderBy'}
-     || $Order ne $session{'CurrentSearchHash'}->{'Order'} )
+if ( ( $OrderBy || '' ) ne ( $session{'CurrentSearchHash'}->{'OrderBy'} || '' )
+     || ( $Order || '') ne ( $session{'CurrentSearchHash'}->{'Order'}   || '' ) )
 {
     $session{'CurrentSearchHash'}->{'OrderBy'} = $OrderBy;
     $session{'CurrentSearchHash'}->{'Order'}   = $Order;
@@ -83,7 +83,7 @@
 $Rows           => undef
 $Page           => 1
 $OrderBy        => $session{'CurrentSearchHash'}->{'OrderBy'} || 'id'
-$Order          => $session{'CurrentSearchHash'}->{'Order'} || 'ASC'
+$Order          => $session{'CurrentSearchHash'}->{'Order'}   || 'ASC'
 
 $BaseURL        => "RTIR/Search/Results.html?"
 

Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html	Tue Apr  4 14:42:35 2006
@@ -30,11 +30,11 @@
 
 <form action="Update.html" name="TicketUpdate" 
 	method="post" enctype="multipart/form-data">
-<input type="hidden" name="QuoteTransaction" value="<% $ARGS{QuoteTransaction} %>" />
-<input type="hidden" name="DefaultStatus" value="<% $ARGS{DefaultStatus} %>" />
-<input type="hidden" name="Status" value="<% $ARGS{DefaultStatus} %>" />
-<input type="hidden" name="Action" value="<% $ARGS{Action} %>" />
-<input type="hidden" name="TakeOrStealFirst" value="<% $ARGS{TakeOrStealFirst} %>" />
+<input type="hidden" name="QuoteTransaction" value="<% $ARGS{'QuoteTransaction'} || '' %>" />
+<input type="hidden" name="DefaultStatus" value="<% $DefaultStatus || '' %>" />
+<input type="hidden" name="Status" value="<% $DefaultStatus || '' %>" />
+<input type="hidden" name="Action" value="<% $Action || '' %>" />
+<input type="hidden" name="TakeOrStealFirst" value="<% $ARGS{TakeOrStealFirst} || '' %>" />
 % if ($Type eq 'Report' and $ARGS{'DefaultStatus'} eq 'rejected') {
 %   my $query = "Queue = 'Incidents' AND HasMember = " . $Ticket->Id;
 %   my $incidents = new RT::Tickets($session{'CurrentUser'});
@@ -88,8 +88,7 @@
     Default => ($ARGS{Owner}||$Ticket->Owner()||$session{'CurrentUser'}->Id||undef), 
     QueueObj => $Ticket->QueueObj, 
     TicketObj => $Ticket &>
-<&|/l&>Worked</&>: <input size="4" name="UpdateTimeWorked" value="<%
-$ARGS{UpdateTimeWorked}%>" /> <&|/l&>minutes</&>
+<&|/l&>Worked</&>: <input size="4" name="UpdateTimeWorked" value="<% $ARGS{'UpdateTimeWorked'} || '' %>" /><&|/l&>minutes</&>
 </td></tr>
 <tr><td align="right"><&|/l&>Subject</&>:</td><td> <input name="UpdateSubject" size="60" value="<% $Subject %>" /></td></tr>