X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fhtml%2FTicket%2FElements%2FShowHistory;h=45cd5122f06e22a8dc162460909f5e2ce88358a4;hb=8103c1fc1b2c27a6855feadf26f91b980a54bc52;hp=c4fe41747c14a31fe99e2b93f5ac44b9c7a412d0;hpb=c582e92888b4a5553e1b4e5214cf35217e4a0cf0;p=freeside.git

diff --git a/rt/html/Ticket/Elements/ShowHistory b/rt/html/Ticket/Elements/ShowHistory
index c4fe41747..45cd5122f 100644
--- a/rt/html/Ticket/Elements/ShowHistory
+++ b/rt/html/Ticket/Elements/ShowHistory
@@ -1,8 +1,14 @@
-%# BEGIN LICENSE BLOCK
+%# BEGIN BPS TAGGED BLOCK {{{
 %# 
-%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# COPYRIGHT:
+%#  
+%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+%#                                          <jesse@bestpractical.com>
 %# 
-%# (Except where explictly superceded by other copyright notices)
+%# (Except where explicitly superseded by other copyright notices)
+%# 
+%# 
+%# LICENSE:
 %# 
 %# This work is made available to you under the terms of Version 2 of
 %# the GNU General Public License. A copy of that license should have
@@ -14,54 +20,70 @@
 %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %# General Public License for more details.
 %# 
-%# Unless otherwise specified, all modifications, corrections or
-%# extensions to this work which alter its source code become the
-%# property of Best Practical Solutions, LLC when submitted for
-%# inclusion in the work.
+%# You should have received a copy of the GNU General Public License
+%# 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.
+%# 
 %# 
+%# CONTRIBUTION SUBMISSION POLICY:
 %# 
-%# END LICENSE BLOCK
+%# (The following paragraph is not intended to limit the rights granted
+%# to you to modify and distribute this software under the terms of
+%# the GNU General Public License and is only of importance to you if
+%# you choose to contribute your changes and enhancements to the
+%# community by submitting them to Best Practical Solutions, LLC.)
+%# 
+%# By intentionally submitting any modifications, corrections or
+%# derivatives to this work, or any other work intended for use with
+%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+%# royalty-free, perpetual, license to use, copy, create derivative
+%# works based on those contributions, and sublicense and distribute
+%# those contributions and any derivatives thereof.
+%# 
+%# END BPS TAGGED BLOCK }}}
+<%doc>
+#   This is (ab)used in Admin/(Users|Groups)/History.html and should probably
+#   be generalized at some point.
+</%doc>
 <%perl>
- if ($ShowDisplayModes or $ShowTitle) {
-my $title;
-my $titleright;
-if ($ShowTitle) {
-    $title = loc('History');
-}
-else {
-    $title = '&nbsp;';
-}
-$titleright = loc('Display mode') . ":";
-if ($ShowHeaders &&  $ShowHeaders == $Ticket->Id ) {
-    $titleright .= "[<A HREF=\"" . $URIFile . "?id="
-      . $Ticket->id . "\">"
-      . loc("Brief headers")
-      . "</a>] <b>["
-      . loc("Full headers") . "]</b>";
-}
-else {
-    $titleright .= "<b>["
-      . loc("Brief headers")
-      . "]</b> [<A HREF=\""
-      . $URIFile
-      . "?ShowHeaders="
-      . $Ticket->Id . "&id="
-      . $Ticket->id . "\">"
-      . loc("Full headers") . "</a>]";
-}
+if ($ShowDisplayModes or $ShowTitle) {
+    my $title = $ShowTitle
+                    ? loc('History')
+                    : '&nbsp;';
+
+    my $titleright;
+
+    if ($ShowDisplayModes) {
+        $titleright = q[<span style="color: black">] . loc('Display mode') . ':</span> ';
+        
+        if ($ShowHeaders) {
+            $titleright .= qq{<a href="$URIFile?id=} .
+                           $Ticket->id.qq{">} .
+                           loc("Brief headers") .
+                           qq{</a> &mdash; };
+            $titleright .= q[<span class="selected">] . loc("Full headers") . "</span>";
+        }
+        else {
+            $titleright .= q[<span class="selected">] . loc("Brief headers") . "</span> &mdash; ";
+            $titleright .= qq{<a href="$URIFile?ShowHeaders=1;id=} .
+                           $Ticket->id.qq{">} .
+                           loc("Full headers") .
+                           qq{</a>};
+        }
+    }
 </%perl>
-<& /Elements/TitleBoxStart, title => $title, titleright => $titleright, bodyclass=> ''&>
+<& /Widgets/TitleBoxStart, title => $title, titleright => $titleright &>
 % }
 
-<TABLE WIDTH=100% CELLSPACING=0 CELLPADDING=2 BORDER=0>
+<div id="ticket-history">
 <%perl>
 my @attachments = @{$Attachments->ItemsArrayRef()};
 my @attachment_content = @{$AttachmentContent->ItemsArrayRef()};
 
-
-
-
-
 while ( my $Transaction = $Transactions->Next ) {
     my $skip = 0;
     $m->comp( '/Elements/Callback',
@@ -72,8 +94,6 @@ while ( my $Transaction = $Transactions->Next ) {
     next if $skip;
     $i++;
 
-    $m->out('<a name="lasttrans"></a>') if ( $Transactions->IsLast );
-
     my @trans_attachments = grep { $_->TransactionId == $Transaction->Id } @attachments;
 
     my $trans_content = {};
@@ -84,8 +104,8 @@ while ( my $Transaction = $Transactions->Next ) {
     $m->comp( 'ShowTransaction',
             %ARGS,
 
-	      AttachPath	  => $AttachPath,
-	      UpdatePath	   => $UpdatePath,
+              AttachPath           => $AttachPath,
+              UpdatePath           => $UpdatePath,
               Ticket               => $Ticket,
               Transaction          => $Transaction,
               ShowHeaders          => $ShowHeaders,
@@ -93,30 +113,47 @@ while ( my $Transaction = $Transactions->Next ) {
               RowNum               => $i,
               ShowTitleBarCommands => $ShowTitleBarCommands,
               Attachments          => \@trans_attachments,
-              AttachmentContent    => $trans_content
+              AttachmentContent    => $trans_content,
+              LastTransaction      => $Transactions->IsLast
  );
+
+# manually flush the content buffer after each txn, so the user sees
+# some update
+$m->flush_buffer(); 
 }
 
 </%perl>
-</TABLE>
+</div>
 % if ($ShowDisplayModes or $ShowTitle) {
-<& /Elements/TitleBoxEnd &>
+<& /Widgets/TitleBoxEnd &>
 % }
 <%INIT>
+my $Transactions = new RT::Transactions($session{'CurrentUser'});
+if ($Tickets) {
+    while (my $t = $Tickets->Next) {
+        $Transactions->LimitToTicket($t->id);
+    }
+} else {
+    $Transactions = $Ticket->Transactions;
+}
 
-my $Transactions = $Ticket->Transactions;
-my $i;
 
+my $OldestFirst = $RT::OldestTransactionsFirst? 'ASC': 'DESC';
+$Transactions->OrderByCols( { FIELD => 'Created',
+                              ORDER => $OldestFirst },
+                            { FIELD => 'id',
+                              ORDER => $OldestFirst },
+                          );
 
-$Attachments ||=  $m->comp('/Ticket/Elements/FindAttachments', Ticket => $Ticket);
+my $i;
+$Attachments ||=  $m->comp('/Ticket/Elements/FindAttachments', Ticket => $Ticket, Tickets => $Tickets || undef);
 $AttachmentContent ||= $m->comp('/Ticket/Elements/LoadTextAttachments', Ticket => $Ticket);
 
-
-
 </%INIT>
 <%ARGS>
 $URIFile => $RT::WebPath."/Ticket/Display.html"
 $Ticket => undef
+$Tickets => undef
 $Attachments => undef
 $AttachmentContent => undef
 $ShowHeaders => undef
@@ -126,5 +163,4 @@ $ShowDisplayModes => 1
 $ShowTitleBarCommands => 1
 $AttachPath => $RT::WebPath."/Ticket/Attachment"
 $UpdatePath => $RT::WebPath."/Ticket/Update.html"
-
 </%ARGS>