[freeside-commits] freeside/rt/html/Ticket Create.html, 1.1.1.5, 1.1.1.5.4.1 Display.html, 1.1.1.5, 1.1.1.5.4.1

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/rt/html/Ticket
In directory wavetail.420.am:/tmp/cvs-serv10370/html/Ticket

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	Create.html Display.html 
Log Message:
merge in rt 3.4.6.  *gulp*!

Index: Create.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Ticket/Create.html,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.5.4.1
diff -u -d -r1.1.1.5 -r1.1.1.5.4.1
--- Create.html	15 Oct 2005 09:09:57 -0000	1.1.1.5
+++ Create.html	3 Mar 2008 23:07:39 -0000	1.1.1.5.4.1
@@ -105,7 +105,7 @@
 <&|/l&>Subject</&>:
 </TD>
 <TD class=value COLSPAN=5>
-<INPUT Name="Subject" SIZE=60 MAXSIZE=100 value="<%$ARGS{Subject} || ''%>">
+<INPUT Name="Subject" SIZE=60 MAXSIZE=200 value="<%$ARGS{Subject} || ''%>">
 </TD>
 </TR>
 <TR>

Index: Display.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Ticket/Display.html,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.5.4.1
diff -u -d -r1.1.1.5 -r1.1.1.5.4.1
--- Display.html	15 Oct 2005 09:09:57 -0000	1.1.1.5
+++ Display.html	3 Mar 2008 23:07:41 -0000	1.1.1.5.4.1
@@ -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);