merge in rt 3.4.6. *gulp*!

9 files changed, 70 insertions, 55 deletions

diff --git a/rt/html/Ticket/Create.html b/rt/html/Ticket/Create.html
index b547242f2..fc4cc20ef 100644
--- a/rt/html/Ticket/Create.html
+++ b/rt/html/Ticket/Create.html
@@ -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>
diff --git a/rt/html/Ticket/Display.html b/rt/html/Ticket/Display.html
index dd4c093dc..908a7a93a 100644
--- a/rt/html/Ticket/Display.html
+++ b/rt/html/Ticket/Display.html
@@ -128,17 +128,19 @@ if ($ARGS{'id'} eq 'new') {
     }
 
     $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);
diff --git a/rt/html/Ticket/Elements/EditCustomFields b/rt/html/Ticket/Elements/EditCustomFields
index 6ae188fa7..78da71201 100644
--- a/rt/html/Ticket/Elements/EditCustomFields
+++ b/rt/html/Ticket/Elements/EditCustomFields
@@ -48,8 +48,7 @@
 <td valign="top" width="50%">
 <table>
 
-% my @entry_fields;
-% my $i;
+% my $i = 0;
 % my $cfcount = $CustomFields->Count;
 %  $cfcount++ if ($cfcount % 2) ; # if we have an odd number of 
 % #custom fields, fudge it so we know where to put in the table break
diff --git a/rt/html/Ticket/Elements/PreviewScrips b/rt/html/Ticket/Elements/PreviewScrips
index a3492b749..491f8e3f3 100755
--- a/rt/html/Ticket/Elements/PreviewScrips
+++ b/rt/html/Ticket/Elements/PreviewScrips
@@ -86,15 +86,19 @@ my ( $Transaction, $Description, $Object ) = $TicketObj->$action(
     TimeTaken    => $ARGS{'UpdateTimeWorked'},
     DryRun       => 1
 );
+unless ( $Transaction ) {
+    $RT::Logger->error("Coulfn't fire '$action' action: $Description");
+}
 
 
 my @non_recipients = $TicketObj->SquelchMailTo;
 </%init>
 <h2><&|/l&>This message will be sent to...</&></h2>
+% if ( $Object ) {
 <i><&|/l&>(Check boxes to disable notifications to the listed recipients)</&></i><br>
 % foreach my $scrip (@{$Object->Scrips->Prepared}) {
 % next unless $scrip->ActionObj->Action->isa('RT::Action::SendEmail');
-<b><%$scrip->Description%></b><br>
+<b><% $scrip->Description %></b><br>
 <&|/l, loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name)&>[_1] [_2] with template [_3]</&>
 <br>
 %foreach my $type qw(To Cc Bcc) {
@@ -110,8 +114,10 @@ my @non_recipients = $TicketObj->SquelchMailTo;
 <%$scrip->ActionObj->TemplateObj->MIMEObj->as_string%>
 </textarea>
 % }
-%}
-<br>
+% }
+% }
+<br />
+
 <h2><&|/l&>Messages about this ticket will not be sent to...</&></h2>
 <i><&|/l&>(Check boxes to enable notifications to the listed recipients)</&></i>
 <br>
diff --git a/rt/html/Ticket/Elements/ShowBasics b/rt/html/Ticket/Elements/ShowBasics
index 00ed3ccd1..e5f09f693 100644
--- a/rt/html/Ticket/Elements/ShowBasics
+++ b/rt/html/Ticket/Elements/ShowBasics
@@ -45,36 +45,36 @@
 %# END BPS TAGGED BLOCK }}}
 <table>
   <tr>
-    <td class="label"><&|/l&>Id</&>:</td>
-    <td class="value"><%$Ticket->Id %></td>
+    <td class="label id"><&|/l&>Id</&>:</td>
+    <td class="value id"><%$Ticket->Id %></td>
   </tr>
   <tr>
-    <td class="label"><&|/l&>Status</&>:</td>
-    <td class="value"><&|/l&><% $Ticket->Status%></&></td>
+    <td class="label status"><&|/l&>Status</&>:</td>
+    <td class="value status"><&|/l&><% $Ticket->Status%></&></td>
   </tr>
 % if ($Ticket->TimeEstimated) {
   <tr>
-    <td class="label"><&|/l&>Estimated</&>:</td>
-    <td class="value"><&|/l, $Ticket->TimeEstimated &>[_1] min</&></td>
+    <td class="label time estimated"><&|/l&>Estimated</&>:</td>
+    <td class="value time estimated"><&|/l, $Ticket->TimeEstimated &>[_1] min</&></td>
   </tr>
 % }
 % if ($Ticket->TimeWorked) {
   <tr>
-    <td class="label"><&|/l&>Worked</&>:</td>
-    <td class="value"><&|/l, $Ticket->TimeWorked &>[_1] min</&></td>
+    <td class="label time worked"><&|/l&>Worked</&>:</td>
+    <td class="value time worked"><&|/l, $Ticket->TimeWorked &>[_1] min</&></td>
   </tr>
 % }
   <tr>
-    <td class="label"><&|/l&>Left</&>:</td>
-    <td class="value"><&|/l, $Ticket->TimeLeft &>[_1] min</&></td>
+    <td class="label time left"><&|/l&>Left</&>:</td>
+    <td class="value time left"><&|/l, $Ticket->TimeLeft &>[_1] min</&></td>
   </tr>
   <tr>
-    <td class="label"><&|/l&>Priority</&>:</td>
-    <td class="value"><%$Ticket->Priority%>/<%$Ticket->FinalPriority %></td>
+    <td class="label priority"><&|/l&>Priority</&>:</td>
+    <td class="value priority"><%$Ticket->Priority%>/<%$Ticket->FinalPriority %></td>
   </tr>
   <tr>
-    <td class="label"><&|/l&>Queue</&>:</td>
-    <td class="value"><%$Ticket->QueueObj->Name%></td>
+    <td class="label queue"><&|/l&>Queue</&>:</td>
+    <td class="value queue"><%$Ticket->QueueObj->Name%></td>
   </tr>
 <& /Elements/Callback, _CallbackName => 'EndOfList', TicketObj => $Ticket, %ARGS &>
 </table>
diff --git a/rt/html/Ticket/Elements/ShowDates b/rt/html/Ticket/Elements/ShowDates
index 2ccbb3fea..322fafd99 100644
--- a/rt/html/Ticket/Elements/ShowDates
+++ b/rt/html/Ticket/Elements/ShowDates
@@ -45,36 +45,36 @@
 %# END BPS TAGGED BLOCK }}}
 <TABLE>
   <TR>
-    <TD class="label"><&|/l&>Created</&>:</TD>
-    <TD class="value"><% $Ticket->CreatedObj->AsString %></TD>
+    <TD class="label date created"><&|/l&>Created</&>:</TD>
+    <TD class="value date created"><% $Ticket->CreatedObj->AsString %></TD>
   </TR>
   <TR>
-    <TD class="label"><&|/l&>Starts</&>:</TD>
-    <TD class="value"><% $Ticket->StartsObj->AsString %></TD>
+    <TD class="label date starts"><&|/l&>Starts</&>:</TD>
+    <TD class="value date starts"><% $Ticket->StartsObj->AsString %></TD>
   </TR>
   <TR>
-    <TD class="label"><&|/l&>Started</&>:</TD>
-    <TD class="value"><% $Ticket->StartedObj->AsString %></TD>
+    <TD class="label date started"><&|/l&>Started</&>:</TD>
+    <TD class="value date started"><% $Ticket->StartedObj->AsString %></TD>
   </TR>
   <TR>
-    <TD class="label"><a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$Ticket->id%>&Action=SetTold"><&|/l&>Last Contact</&></a>:</TD>
-    <TD class="value"><% $Ticket->ToldObj->AsString %></TD>
+    <TD class="label date told"><a href="<% $RT::WebPath %>/Ticket/Display.html?id=<% $Ticket->id %>&Action=SetTold"><&|/l&>Last Contact</&></a>:</TD>
+    <TD class="value date told"><% $Ticket->ToldObj->AsString %></TD>
   </TR>
   <TR>
-    <TD class="label"><&|/l&>Due</&>:</TD>
-    <TD class="value"><% $Ticket->DueObj->AsString  %></TD>
+    <TD class="label date due"><&|/l&>Due</&>:</TD>
+    <TD class="value date due"><% $Ticket->DueObj->AsString  %></TD>
   </TR>
   <TR>
-    <TD class="label"><&|/l&>Closed</&>:</TD>
-    <TD class="value"><% $Ticket->ResolvedObj->AsString  %></TD>
+    <TD class="label date resolved"><&|/l&>Closed</&>:</TD>
+    <TD class="value date resolved"><% $Ticket->ResolvedObj->AsString  %></TD>
   </TR>
   <TR>
-    <TD class="label"><&|/l&>Updated</&>:</TD>
-% my $UpdatedString = $Ticket->LastUpdated ? (loc("[_1] by [_2]", $Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)) : loc("Never");
+    <TD class="label date updated"><&|/l&>Updated</&>:</TD>
+% my $UpdatedString = $Ticket->LastUpdated ? loc("[_1] by [_2]", $Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name) : loc("Never");
 % if ($UpdatedLink) {
-    <TD class="value"><A HREF="#lasttrans"><% $UpdatedString | h %></a></TD>
+    <TD class="value date updated"><A HREF="#lasttrans"><% $UpdatedString | h %></a></TD>
 % } else {
-    <TD class="value"><% $UpdatedString | h %></TD>
+    <TD class="value date updated"><% $UpdatedString | h %></TD>
 % }
   </TR>
 </TABLE>
diff --git a/rt/html/Ticket/Elements/ShowHistory b/rt/html/Ticket/Elements/ShowHistory
index 75e34776f..878e2535c 100644
--- a/rt/html/Ticket/Elements/ShowHistory
+++ b/rt/html/Ticket/Elements/ShowHistory
@@ -136,8 +136,16 @@ if ($Tickets) {
 } else {
     $Transactions = $Ticket->Transactions;
 }
-my $i;
 
+
+my $OldestFirst = $RT::OldestTransactionsFirst? 'ASC': 'DESC';
+$Transactions->OrderByCols( { FIELD => 'Created',
+                              ORDER => $OldestFirst },
+                            { FIELD => 'id',
+                              ORDER => $OldestFirst },
+                          );
+
+my $i;
 $Attachments ||=  $m->comp('/Ticket/Elements/FindAttachments', Ticket => $Ticket, Tickets => $Tickets || undef);
 $AttachmentContent ||= $m->comp('/Ticket/Elements/LoadTextAttachments', Ticket => $Ticket);
 
diff --git a/rt/html/Ticket/Elements/ShowRequestor b/rt/html/Ticket/Elements/ShowRequestor
index 421d38e0a..57bfa0e55 100644
--- a/rt/html/Ticket/Elements/ShowRequestor
+++ b/rt/html/Ticket/Elements/ShowRequestor
@@ -47,17 +47,14 @@
 my $rows = 10;
 my $people = $Ticket->Requestors->UserMembersObj;
 while (my $requestor=$people->Next) {
+next if $requestor->Privileged;
 my $name=$requestor->RealName || $requestor->EmailAddress;	
 my $tickets = RT::Tickets->new($session{'CurrentUser'});
-$tickets->LimitWatcher(TYPE => 'Requestor', VALUE => $requestor->EmailAddress );
-$tickets->LimitStatus( VALUE => 'open');
-$tickets->LimitStatus( VALUE => 'new');
+$tickets->FromSQL( "Requestor.id = ". $requestor->id ." AND (Status = 'open' OR Status = 'new')" );
 $tickets->RowsPerPage($rows);
-$tickets->OrderBy(FIELD => 'Priority',
-		  ORDER => 'DESC');
+$tickets->OrderBy(FIELD => 'Priority', ORDER => 'DESC');
 </%PERL>
 
-% unless ($requestor->Privileged) {
 <& /Elements/TitleBoxStart, 
 	title => "<a class='inverse' href=\"$RT::WebPath/Admin/Users/Modify.html?id=".$requestor->id."\">".loc("More about [_1]", $name)."</a>" &>
 
@@ -80,7 +77,6 @@ $tickets->OrderBy(FIELD => 'Priority',
 
 <& /Elements/TitleBoxEnd &>
 
-% }
 %}
 <%ARGS>
 $Ticket=>undef
diff --git a/rt/html/Ticket/Elements/ShowSummary b/rt/html/Ticket/Elements/ShowSummary
index 5a6e7e099..e2f3e7195 100644
--- a/rt/html/Ticket/Elements/ShowSummary
+++ b/rt/html/Ticket/Elements/ShowSummary
@@ -79,6 +79,9 @@
           <& /Elements/TitleBoxEnd &>
 
 	<BR>
+
+    <& /Elements/Callback, %ARGS, _CallbackName => 'LeftColumn' &>
+
 	</TD>
 	<TD VALIGN=TOP WIDTH="50%" class="boxcontainer">
 
@@ -100,6 +103,7 @@
 
 	  <& /Ticket/Elements/ShowRequestor, Ticket => $Ticket &>
 
+    <& /Elements/Callback, %ARGS, _CallbackName => 'RightColumn' &>
 
 	</TD>
       </TR>