[Rt-commit] [svn] r984 - in rt/branches/rt-3.1: . bin html/Search lib/RT

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Mon May 31 21:45:11 2004
New Revision: 984

Modified:
   rt/branches/rt-3.1/   (props changed)
   rt/branches/rt-3.1/bin/rt.in
   rt/branches/rt-3.1/html/Search/Bulk.html
   rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
Log:
 ----------------------------------------------------------------------
 r1735 at debian:  jesse | 2004-06-01T10:41:57.961517Z
 
 
 ----------------------------------------------------------------------
 r1737 at debian:  jesse | 2004-06-01T10:45:15.986227Z
 
 Merging from 3.0
 ----------------------------------------------------------------------


Modified: rt/branches/rt-3.1/bin/rt.in
==============================================================================
--- rt/branches/rt-3.1/bin/rt.in	(original)
+++ rt/branches/rt-3.1/bin/rt.in	Mon May 31 21:45:11 2004
@@ -153,7 +153,6 @@
             foreach $title (grep $_, @titles) {
                 $help{$title} = $item->[2]{Text};
             }
-        }
     }
 
     # What does the user want help with?

Modified: rt/branches/rt-3.1/html/Search/Bulk.html
==============================================================================
--- rt/branches/rt-3.1/html/Search/Bulk.html	(original)
+++ rt/branches/rt-3.1/html/Search/Bulk.html	Mon May 31 21:45:11 2004
@@ -182,6 +182,11 @@
     $RT::Logger->debug( "Checking Ticket ".$Ticket->Id ."\n");
     next unless ($ARGS{"UpdateTicket".$Ticket->Id});
     $RT::Logger->debug ("Matched\n");
+    my @updateresults; 
+    if ($do_comment_reply) {
+       ProcessUpdateMessage(TicketObj => $Ticket, ARGSRef => \%ARGS, Actions => \@updateresults); 
+    }
+
     #Update the basics.
     my @basicresults = ProcessTicketBasics(TicketObj => $Ticket, ARGSRef => \%ARGS);
     my @dateresults = ProcessTicketDates(TicketObj => $Ticket, ARGSRef => \%ARGS);
@@ -207,11 +212,7 @@
     delete $ARGS{$Ticket->Id.'-RefersTo'};
     delete $ARGS{'RefersTo-'.$Ticket->Id};
     
-    my @updateresults; 
-    if ($do_comment_reply) {
-    ProcessUpdateMessage(TicketObj => $Ticket, ARGSRef => \%ARGS, Actions => \@updateresults); 
-   } 
-   my @tempresults = (@watchresults, @basicresults, @dateresults, @updateresults, @linkresults);
+    my @tempresults = (@watchresults, @basicresults, @dateresults, @updateresults, @linkresults);
     @tempresults = map { loc("Ticket [_1]: [_2]",$Ticket->Id,$_) } @tempresults;
 
     @results = (@results, @tempresults);

Modified: rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
==============================================================================
--- rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm	(original)
+++ rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm	Mon May 31 21:45:11 2004
@@ -447,6 +447,11 @@
     local($self->{'first_row'}, $self->{'show_rows'});
     $self->CleanSlate;
   }
+  {
+    # preserve first_row and show_rows across the CleanSlate
+    local($self->{'first_row'}, $self->{'show_rows'});
+    $self->CleanSlate;
+  }
   $self->_InitSQL();
 
   return (1,$self->loc("No Query")) unless $query;