[freeside-commits] freeside/rt/html/Ticket Create.html, 1.2, 1.2.2.1 Display.html, 1.2, 1.2.2.1

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	Create.html Display.html 
Log Message:
rt 3.6.10

Index: Create.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Ticket/Create.html,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- Create.html	20 Jul 2009 04:14:27 -0000	1.2
+++ Create.html	31 Dec 2009 12:44:24 -0000	1.2.2.1
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
 %#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -24,7 +24,7 @@
 %# along with this program; if not, write to the Free Software
 %# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 %# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/copyleft/gpl.html.
+%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -86,7 +86,7 @@
 </td>
 </tr>
 <tr>
-<td class="labeltop">
+<td class="label">
 <&|/l&>Cc</&>:
 </td>
 <td class="value" colspan="5">
@@ -96,7 +96,7 @@
 </td>
 </tr>
 <tr>
-<td class="labeltop">
+<td class="label">
 <&|/l&>Admin Cc</&>:
 </td>
 <td class="value" colspan="5">
@@ -152,6 +152,7 @@
 <tr>
 <td colspan="6">
 <&|/l&>Describe the issue below</&>:<br />
+<& /Elements/Callback, _CallbackName => 'BeforeMessageBox', QueueObj => $QueueObj, %ARGS &>
 % if (exists $ARGS{Content}) {
 <& /Elements/MessageBox, Default => $ARGS{Content}, IncludeSignature => 0 &>
 % } else {

Index: Display.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Ticket/Display.html,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- Display.html	12 Jul 2009 23:22:06 -0000	1.2
+++ Display.html	31 Dec 2009 12:44:24 -0000	1.2.2.1
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
 %#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -24,7 +24,7 @@
 %# along with this program; if not, write to the Free Software
 %# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 %# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/copyleft/gpl.html.
+%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -135,11 +135,10 @@
     }
 
     $ARGS{'UpdateContent'} =~ s/\r\n/\n/g if defined $ARGS{'UpdateContent'};
-    if ( $ARGS{'UpdateTimeWorked'} || (
-        defined $ARGS{'UpdateContent'}
+    if ( ( defined $ARGS{'UpdateContent'}
         && $ARGS{'UpdateContent'} ne ''
 	    && $ARGS{'UpdateContent'} ne "-- \n"
-	       . $session{'CurrentUser'}->UserObj->Signature ) )
+	       . $session{'CurrentUser'}->UserObj->Signature ) || $session{'Attachments'} )
     {
 	    $ARGS{UpdateAttachments} = $session{'Attachments'};
 	    ProcessUpdateMessage(
@@ -148,6 +147,9 @@
 			TicketObj => $TicketObj,
         );
 	    delete $session{'Attachments'};
+    } elsif ( $ARGS{'UpdateTimeWorked'} ) {
+        # Add UpdateTimeWorked to TimeWorked (processed below with ProcessTicketBasics)
+        $ARGS{'TimeWorked'} = $TicketObj->TimeWorked + $ARGS{'UpdateTimeWorked'};
     }
     #Process status updates
     my @PeopleActions = ProcessTicketWatchers(ARGSRef => \%ARGS, TicketObj=>$TicketObj);