[Rt-commit] r4702 - in rtir/branches/1.9-EXPERIMENTAL: html/RTIR/Elements html/RTIR/Report

ruz at bestpractical.com ruz at bestpractical.com
Mon Mar 6 18:32:53 EST 2006


Author: ruz
Date: Mon Mar  6 18:32:52 2006
New Revision: 4702

Modified:
   rtir/branches/1.9-EXPERIMENTAL/   (props changed)
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/QueueTabs
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Report/BulkReject.html

Log:
 r875 at cubic-pc:  cubic | 2006-03-06 02:41:11 +0300
 * generate tabs for BulkReject with search query
 * don't pass format while redirect to search results
   because of checkbox.


Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/QueueTabs
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/QueueTabs	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/QueueTabs	Mon Mar  6 18:32:52 2006
@@ -269,7 +269,7 @@
 
 if ( $Type eq 'Report' ) {
     $tabs->{"h"} = {
-        path      => 'RTIR/Report/BulkReject.html',
+        path      => "RTIR/Report/BulkReject.html?$EscapedQueueName&$QueryString",
         title     => loc('Bulk Reject'),
         separator => 1
     };

Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Report/BulkReject.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Report/BulkReject.html	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Report/BulkReject.html	Mon Mar  6 18:32:52 2006
@@ -47,11 +47,10 @@
     Query     => $Query,
     Format    => $Format,
     Rows      => $Rows,
+    Page      => $Page,
     OrderBy   => $OrderBy,
     Order     => $Order,
-    Page      => $Page,
     BaseURL   => $BaseURL,
-    Format    => $Format,
 &>
 
 % if( $session{'tickets'}->Count ) {
@@ -75,7 +74,7 @@
 my $title         = loc("Reject Incident Reports");
 my $SubmitCaption = loc("Reject selected incident reports");
 
-$Format = "___RTIR_Check__,$Format" unless $Format =~ /__RTIR_Check__/;
+$Format = "__RTIR_Check__,$Format" unless $Format =~ /__RTIR_Check__/;
 
 my ( @results );
 if ( $BulkReject ) {
@@ -83,9 +82,6 @@
 
     #Iterate through each ticket we've been handed
     foreach my $id( @SelectedTickets ) {
-        $m->out('<!--  Processing <%$id%> -->');
-        $m->flush_buffer;
-
         my $t = RT::Ticket->new( $session{'CurrentUser'} );
         $t->Load( $id );
         unless( $t->id ) {
@@ -134,18 +130,18 @@
     $session{'tickets'}->RedoSearch;
 
     if( $BulkRejectAndReturn ) {
-        $m->comp(
+        return $m->comp(
             '/RTIR/Search/Results.html',
             Queue     => $Queue,
             Query     => $Query,
-            Format    => $Format,
+            # Skip format, since it contains checkbox
+            # Format    => $Format,
             Rows      => $Rows,
             OrderBy   => $OrderBy,
             Order     => $Order,
             Page      => $Page,
             results   => \@results,
         );
-        return;
     }
 }
 
@@ -158,6 +154,9 @@
     Order     => $Order,
     Page      => $Page
 );
+$current_tab ||= "RTIR/Report/BulkReject.html?"
+    . $m->comp('/Elements/QueryString', Queue => $Queue)
+    . "&$QueryString";
 
 my $path = "RTIR/Search/Refine.html?$QueryString&";
 $path .= $m->comp( '/Elements/QueryString',
@@ -168,17 +167,17 @@
 
 </%INIT>
 <%ARGS>
+$Status              => 'rejected'
 $Queue               => 'Incident Reports'
 $BaseQuery           => $m->comp( '/RTIR/Elements/BaseQuery', Queue => $Queue )
 $Query               => $m->comp( '/RTIR/Elements/NewQuery',  Queue => $Queue )
-$Status              => 'rejected'
 $Format              => RT->Config->Get('RTIRSearchResultFormats')->{'RejectReports'};
 $Rows                => 50
 $Page                => 1
 $OrderBy             => 'id'
 $Order               => 'ASC'
 $BaseURL             => RT->Config->Get('WebPath') . "/RTIR/Report/BulkReject.html?"
-$current_tab         => 'RTIR/Report/BulkReject.html'
+$current_tab         => undef
 @SelectedTickets     => ()
 $BulkRejectAndReturn => 0
 $BulkReject          => $BulkRejectAndReturn


More information about the Rt-commit mailing list