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

[ruz at bestpractical.com]

Author: ruz
Date: Sat Dec 17 21:15:59 2005
New Revision: 4328

Modified:
   rtir/branches/1.9-EXPERIMENTAL/   (props changed)
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ShowResults
Log:
 r582 at cubic-pc:  cubic | 2005-12-18 05:18:33 +0300
  r574 at cubic-pc:  cubic | 2005-12-18 03:30:59 +0300
  * escape URI parts
  * take some defaults from current search hash
 


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	Sat Dec 17 21:15:59 2005
@@ -15,12 +15,15 @@
 %# this would do well as a Callback
 
 <div align="right">
-<a href="<%$RT::WebPath%>/RTIR/Report/BulkReject.html<%$QueryString%>&Queue=<%$Queue%>"><&|/l&>Bulk Reject</&></a><br>
+<a href="<%$RT::WebPath%>/RTIR/Report/BulkReject.html?Queue=<%$Queue|u%>&<% $QueryString %>"><&|/l&>Bulk Reject</&></a><br>
 </div>
 
 % }
 
 <%INIT>
+
+$Query = join ' AND ', map "( $_ )", grep $_, $BaseQuery, $Query;
+
 my $collection = $session{'tickets'} || RT::Tickets->new( $session{'CurrentUser'} );
 $collection->FromSQL( $Query ) if $Query;
 $session{'tickets'} = $collection;
@@ -36,16 +39,17 @@
 
 </%INIT>
 <%ARGS>
-$Queue => undef
-$Query => undef
-$Rows => 50
-$Page => 1
-$OrderBy => $session{'CurrentSearchHash'}->{'OrderBy'} || 'id'
-$Order => $session{'CurrentSearchHash'}->{'Order'} || 'ASC'
-$QueryString => undef
-$BaseURL => $RT::WebPath."/Search/Results.html?"
-$RTIRCheck => undef
+$Queue          => ''
+$BaseQuery      => ''
+$Query          => ''
+$QueryString    => ''
+$Rows           => undef
+$Page           => 1
+$OrderBy        => $session{'CurrentSearchHash'}->{'OrderBy'} || 'id'
+$Order          => $session{'CurrentSearchHash'}->{'Order'} || 'ASC'
+$BaseURL        => $RT::WebPath."/Search/Results.html?"
+$RTIRCheck      => undef
 $ShowNavigation => 0
-$AllowSorting => 1
-$ShowEmpty => 0
+$AllowSorting   => 1
+$ShowEmpty      => 0
 </%ARGS>