[Rt-commit] [svn] r1106 - in rt/trunk: html/Ticket lib/RT/Interface

[alexmv at pallas.eruditorum.org]

Author: alexmv
Date: Thu Jun 17 19:47:40 2004
New Revision: 1106

Modified:
   rt/trunk/html/Ticket/Display.html
   rt/trunk/lib/RT/Interface/Web.pm
Log:
RT-Ticket: 3151
RT-Status: resolved
RT-Update: correspond

 * Add a transaction if there is time worked -- even if there is no
   message


Modified: rt/trunk/html/Ticket/Display.html
==============================================================================
--- rt/trunk/html/Ticket/Display.html	(original)
+++ rt/trunk/html/Ticket/Display.html	Thu Jun 17 19:47:40 2004
@@ -96,18 +96,17 @@
 	}
     }
 
-    if ( $ARGS{'UpdateContent'} || $session{'Attachments'}) {
-        $ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
-        if ( $session{'Attachments'} || 
-	     (   $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'};
-        }
+    $ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
+    if ( $ARGS{'UpdateTimeWorked'} ||
+	 $session{'Attachments'} || 
+	 (   $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);

Modified: rt/trunk/lib/RT/Interface/Web.pm
==============================================================================
--- rt/trunk/lib/RT/Interface/Web.pm	(original)
+++ rt/trunk/lib/RT/Interface/Web.pm	Thu Jun 17 19:47:40 2004
@@ -425,7 +425,8 @@
     );
 
     #Make the update content have no 'weird' newlines in it
-    if ( $args{ARGSRef}->{'UpdateContent'} ||
+    if ( $args{ARGSRef}->{'UpdateTimeWorked'} ||
+	 $args{ARGSRef}->{'UpdateContent'} ||
 	 $args{ARGSRef}->{'UpdateAttachments'}) {
 
         if (