[Rt-commit] r15325 - in rt/3.8/trunk: share/html/Ticket

[sartak at bestpractical.com]

Author: sartak
Date: Thu Aug 21 04:31:52 2008
New Revision: 15325

Modified:
   rt/3.8/trunk/   (props changed)
   rt/3.8/trunk/share/html/Ticket/Modify.html
   rt/3.8/trunk/share/html/Ticket/ModifyAll.html
   rt/3.8/trunk/share/html/Ticket/ModifyPeople.html

Log:
 r69930 at onn:  sartak | 2008-08-21 03:53:32 -0400
 Clean up results accumulation in Ticket/Modify*


Modified: rt/3.8/trunk/share/html/Ticket/Modify.html
==============================================================================
--- rt/3.8/trunk/share/html/Ticket/Modify.html	(original)
+++ rt/3.8/trunk/share/html/Ticket/Modify.html	Thu Aug 21 04:31:52 2008
@@ -80,8 +80,7 @@
 $m->callback( TicketObj => $TicketObj, CustomFields => $CustomFields, ARGSRef => \%ARGS );
 
 my @results = ProcessTicketBasics(TicketObj => $TicketObj, ARGSRef => \%ARGS);
-my @cf_results = ProcessObjectCustomFieldUpdates(Object => $TicketObj, ARGSRef => \%ARGS);
-push (@results, @cf_results);
+push @results, ProcessObjectCustomFieldUpdates(Object => $TicketObj, ARGSRef => \%ARGS);
 
 # undef so that TransactionBatch scrips run and update the ticket
 $TicketObj = undef;

Modified: rt/3.8/trunk/share/html/Ticket/ModifyAll.html
==============================================================================
--- rt/3.8/trunk/share/html/Ticket/ModifyAll.html	(original)
+++ rt/3.8/trunk/share/html/Ticket/ModifyAll.html	Thu Aug 21 04:31:52 2008
@@ -158,7 +158,7 @@
 
 
 $m->callback( TicketObj => $Ticket, ARGSRef => \%ARGS );
-my (@wresults, @results,  @dresults, @lresults, @cf_results);
+my @results;
 
 unless ($OnlySearchForPeople or $OnlySearchForGroup ) {
     # There might be two owners. 
@@ -171,9 +171,9 @@
 
     }
 
-    @wresults   = ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS);
-    @cf_results = ProcessObjectCustomFieldUpdates( Object => $Ticket, ARGSRef => \%ARGS);
-    @dresults   = ProcessTicketDates( TicketObj => $Ticket, ARGSRef => \%ARGS);
+    push @results, ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS);
+    push @results, ProcessObjectCustomFieldUpdates( Object => $Ticket, ARGSRef => \%ARGS);
+    push @results, ProcessTicketDates( TicketObj => $Ticket, ARGSRef => \%ARGS);
 
     if ($ARGS{'UpdateAttachment'}) {
         my $subject = "$ARGS{'UpdateAttachment'}";
@@ -193,12 +193,8 @@
 
     push @results, ProcessUpdateMessage( TicketObj => $Ticket, ARGSRef=>\%ARGS );
     push @results, ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS );
-    @lresults   = ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);
+    push @results, ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);
 }
-push @results, @wresults;
-push @results, @dresults;
-push @results, @lresults;
-push @results, @cf_results;
 
 # undef so that TransactionBatch scrips run and update the ticket
 $Ticket = undef;

Modified: rt/3.8/trunk/share/html/Ticket/ModifyPeople.html
==============================================================================
--- rt/3.8/trunk/share/html/Ticket/ModifyPeople.html	(original)
+++ rt/3.8/trunk/share/html/Ticket/ModifyPeople.html	Thu Aug 21 04:31:52 2008
@@ -65,18 +65,16 @@
 
 <%INIT>
 
-my (@results, @wresults);
+my @results;
 
 my $Ticket = LoadTicket($id);
 $m->callback( TicketObj => $Ticket, ARGSRef => \%ARGS );
 
 # if we're trying to search for watchers and nothing else
 unless ($OnlySearchForPeople or $OnlySearchForGroup) {
-    @results = ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS);
-    @wresults = ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS);
+    push @results, ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS);
+    push @results, ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS);
 }
-
-push @results, @wresults;
 </%INIT>