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

[ruz at bestpractical.com]

Author: ruz
Date: Mon Mar  6 18:33:05 2006
New Revision: 4703

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

Log:
 r876 at cubic-pc:  cubic | 2006-03-06 03:06:11 +0300
 * BulkAbandon tabs with query


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:33:05 2006
@@ -285,7 +285,7 @@
         };
     }
     $tabs->{'k'} = {
-        path      => 'RTIR/Incident/BulkAbandon.html',
+        path      => "RTIR/Incident/BulkAbandon.html?$EscapedQueueName&$QueryString",
         title     => loc('Bulk Abandon'),
         separator => 1
     };

Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html	Mon Mar  6 18:33:05 2006
@@ -90,6 +90,7 @@
 );
 my $title = loc('Abandon Incidents');
 my $SubmitCaption = loc("Abandon selected incidents");
+$Format = "___RTIR_Check__,$Format" unless $Format =~ /___RTIR_Check__/;
 
 my ( @results );
 
@@ -171,7 +172,9 @@
     Order   => $Order,
     Page    => $Page
 );
-
+$current_tab ||= "RTIR/Incident/BulkAbandon.html?"
+    . $m->comp('/Elements/QueryString', Queue => $Queue)
+    . "&$QueryString";
 
 my $path = "RTIR/Search/Refine.html?$QueryString&";
 $path .= $m->comp( '/Elements/QueryString',
@@ -191,8 +194,8 @@
 $Page      => 1
 $OrderBy   => 'id'
 $Order     => 'ASC'
-$BaseURL   => RT->Config->Get('WebPath') . "/RTIR/Report/BulkAbandon.html"
-$current_tab => 'RTIR/Incident/BulkAbandon.html'
+$BaseURL   => RT->Config->Get('WebPath') . "/RTIR/Incident/BulkAbandon.html"
+$current_tab => undef
 @SelectedTickets => ()
 @ReplyToAll => ()
 </%ARGS>

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:33:05 2006
@@ -74,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 ) {