[Rt-commit] r5209 - rt/branches/3.4-RELEASE/html/Ticket

[ruz at bestpractical.com]

Author: ruz
Date: Thu May 11 18:31:58 2006
New Revision: 5209

Modified:
   rt/branches/3.4-RELEASE/html/Ticket/Display.html

Log:
* user do next steps:
    1) open ticket #1
    2) click reply
    3) upload attachment
    4) open ticket #2 in another browser window
    5) send reply to the ticket #1
  RT looses uploaded attachment due to step 4) as RT tries
  to add attchement to the ticket #2 and drops them from session.
  As solution don't ProcessTicketMessage if there is attachments,
  but only if there is real update message.

Modified: rt/branches/3.4-RELEASE/html/Ticket/Display.html
==============================================================================
--- rt/branches/3.4-RELEASE/html/Ticket/Display.html	(original)
+++ rt/branches/3.4-RELEASE/html/Ticket/Display.html	Thu May 11 18:31:58 2006
@@ -128,17 +128,19 @@
     }
 
     $ARGS{'UpdateContent'} =~ s/\r\n/\n/g if defined $ARGS{'UpdateContent'};
-    if ( $ARGS{'UpdateTimeWorked'} ||
-	 $session{'Attachments'} || 
-	 (   defined $ARGS{'UpdateContent'}
-             && $ARGS{'UpdateContent'} ne ''
-	     && $ARGS{'UpdateContent'} ne "-- \n"
-	     . $session{'CurrentUser'}->UserObj->Signature )) {
-	$ARGS{UpdateAttachments} = $session{'Attachments'};
-	ProcessUpdateMessage( ARGSRef   => \%ARGS,
-			      Actions   => \@Actions,
-			      TicketObj => $TicketObj );
-	delete $session{'Attachments'};
+    if ( $ARGS{'UpdateTimeWorked'} || (
+        defined $ARGS{'UpdateContent'}
+        && $ARGS{'UpdateContent'} ne ''
+	    && $ARGS{'UpdateContent'} ne "-- \n"
+	       . $session{'CurrentUser'}->UserObj->Signature ) )
+    {
+	    $ARGS{UpdateAttachments} = $session{'Attachments'};
+	    ProcessUpdateMessage(
+            ARGSRef   => \%ARGS,
+			Actions   => \@Actions,
+			TicketObj => $TicketObj,
+        );
+	    delete $session{'Attachments'};
     }
     #Process status updates
     my @BasicActions = ProcessTicketBasics(ARGSRef => \%ARGS, TicketObj=>$TicketObj);