import rt 3.4.6

1 files changed, 13 insertions, 33 deletions

diff --git a/rt/html/Ticket/Display.html b/rt/html/Ticket/Display.html
index 1c0aa41..908a7a9 100644
--- a/rt/html/Ticket/Display.html
+++ b/rt/html/Ticket/Display.html
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -22,9 +22,7 @@
 %# 
 %# 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.
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -53,12 +51,13 @@
     Title => loc("#[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject) &>
 
 <& /Elements/ListActions, actions => \@Actions &>
-<& /Elements/Callback, _CallbackName => 'BeforeShowSummary', Ticket => $TicketObj, %ARGS &>
-<&| /Widgets/TitleBox, title => loc('Ticket metadata') &>
+
+<& /Elements/TitleBoxStart, title => loc('Ticket metadata'), contentbg =>
+'#ffffff' &>
 <& /Ticket/Elements/ShowSummary,  Ticket => $TicketObj, Attachments => $attachments &>
-</&>
+<& /Elements/TitleBoxEnd &>
 
-<br />
+<BR>
 
 <& /Elements/Callback, _CallbackName => 'BeforeShowHistory', Ticket => $TicketObj, %ARGS &>
 
@@ -72,8 +71,7 @@
       
       &> 
 
-<& /Elements/Callback, _CallbackName => 'AfterShowHistory', Ticket => $TicketObj, %ARGS &>
-
+  
 <%ARGS>
 $id => undef
 $Create => undef
@@ -121,10 +119,6 @@ if ($ARGS{'id'} eq 'new') {
 	}
     }
 
-    $m->comp('/Elements/Callback', _CallbackName => 'BeforeProcessArguments',
-         TicketObj => $TicketObj, Tickets => $Tickets, 
-         ActionsRef => \@Actions, ARGSRef => \%ARGS);
-
     if (defined $ARGS{'Action'}) {
 	if ($ARGS{'Action'} =~ /^(Steal|Kill|Take|SetTold)$/) {
 	    my $action = $1;
@@ -149,31 +143,17 @@ if ($ARGS{'id'} eq 'new') {
 	    delete $session{'Attachments'};
     }
     #Process status updates
-    my @PeopleActions = ProcessTicketWatchers(ARGSRef => \%ARGS, TicketObj=>$TicketObj);
     my @BasicActions = ProcessTicketBasics(ARGSRef => \%ARGS, TicketObj=>$TicketObj);
     my @results = ProcessTicketLinks( TicketObj => $TicketObj, ARGSRef => \%ARGS);
 
-    push (@Actions, @PeopleActions, @BasicActions, @results);
+    push (@Actions, @BasicActions, @results);
 }
 
+
+
 $m->comp('/Elements/Callback', _CallbackName => 'BeforeDisplay',
-	 TicketObj => \$TicketObj,
-     Tickets => \$Tickets,
-     Actions => \@Actions,
-     ARGSRef => \%ARGS,
-);
-
-# This code does automatic redirection if any updates happen. 
-
-if (@Actions) {
-    # We've done something, so we need to clear the decks to avoid 
-    # resubmission on refresh.
-    # But we need to store Actions somewhere too, so we don't lose them.
-    $session{"Actions"} = \@Actions;
-    RT::Interface::Web::Redirect($RT::WebURL."Ticket/Display.html?id=".$TicketObj->id);
-} else {
-    @Actions = @{ delete $session{"Actions"} || [] };
-}
+	 TicketObj => \$TicketObj, Tickets => \$Tickets, ARGSRef => \%ARGS);
+
 
 my $attachments = $m->comp('Elements/FindAttachments', Ticket => $TicketObj, Tickets => $Tickets);
 my $attachment_content = $m->comp('Elements/LoadTextAttachments', Ticket => $TicketObj);