[Rt-commit] r4483 - in rtir/branches/1.9-EXPERIMENTAL: html/RTIR/Elements html/RTIR/Search html/RTIR/Search/Elements

[ruz at bestpractical.com]

Author: ruz
Date: Fri Feb  3 18:40:57 2006
New Revision: 4483

Modified:
   rtir/branches/1.9-EXPERIMENTAL/   (props changed)
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/QueueTabs
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ShowResults
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Results.html

Log:
 r618 at cubic-pc:  cubic | 2006-01-27 23:04:16 +0300
 * minor changes


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	Fri Feb  3 18:40:57 2006
@@ -22,15 +22,15 @@
 %# 
 %# 
 %# END LICENSE BLOCK
-<& /Elements/Callback, Page => '/Ticket/Elements/Tabs', Ticket => $Ticket, actions=> $actions, tabs => $tabs, %ARGS &>
-<& /RTIR/Elements/Tabs, 
+<& /Elements/Callback, %ARGS, Page => '/Ticket/Elements/Tabs', Ticket => $Ticket, actions=> $actions, tabs => $tabs &>
+<& /RTIR/Elements/Tabs,
+    %ARGS,
     tabs => $tabs, 
     actions => $actions, 
     current_toptab => $current_toptab,
     current_tab => $mytab,
     current_subtab => $current_subtab,
     Title => $Title,
-    QueryString => $QueryString,
 &> 
 
 <%INIT>

Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ShowResults
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ShowResults	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ShowResults	Fri Feb  3 18:40:57 2006
@@ -11,10 +11,21 @@
 &>
 
 % if ( $Queue eq 'Incident Reports' && $ShowNavigation ) {
-%# this would do well as a Callback
+<%PERL>
+# this would do well as a Callback
+my $QueryString = $m->comp('/Elements/QueryString'
+                            Queue     => $Queue
+                            Query     => $Query,
+                            Format    => $Format,
+                            Rows      => $Rows,
+                            OrderBy   => $OrderBy,
+                            Order     => $Order,
+                            Page      => $Page,
+                          );
+</%PERL>
 
 <div align="right">
-<a href="<%RT->Config->Get('WebPath')%>/RTIR/Report/BulkReject.html?Queue=<%$Queue|u%>&<% $QueryString %>"><&|/l&>Bulk Reject</&></a><br />
+<a href="<%RT->Config->Get('WebPath')%>/RTIR/Report/BulkReject.html?<% $QueryString %>"><&|/l&>Bulk Reject</&></a>
 </div>
 
 % }
@@ -41,7 +52,6 @@
 $Queue          => ''
 $BaseQuery      => ''
 $Query          => ''
-$QueryString    => ''
 $Rows           => undef
 $Page           => 1
 $OrderBy        => $session{'CurrentSearchHash'}->{'OrderBy'} || 'id'

Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Results.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Results.html	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Results.html	Fri Feb  3 18:40:57 2006
@@ -43,7 +43,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# }}} END BPS TAGGED BLOCK
-<& /Elements/Header, Title => $title, Refresh => $session{'tickets_refresh_interval'} &>
+<& /Elements/Header, Title => $title, Refresh => $session{'tickets_refresh_interval'} || 0 &>
 <& '/RTIR/'.$Type.'/Elements/Tabs',
     current_tab => "RTIR/Search/Results.html?$EscapedQueue&$QueryString",
     Title       => $title,
@@ -67,7 +67,6 @@
     Page        => $Page,
     OrderBy     => $OrderBy,
     Order       => $Order,
-    QueryString => $QueryString,
 &>
 
 <%INIT>