[Rt-commit] [svn] r1404 - in rtir/branches/1.1: etc html/RTIR html/RTIR/Elements html/RTIR/Report

[leira at pallas.eruditorum.org]

Author: leira
Date: Thu Sep  2 17:54:34 2004
New Revision: 1404

Removed:
   rtir/branches/1.1/html/RTIR/Elements/Listing
   rtir/branches/1.1/html/RTIR/Elements/SearchFields
   rtir/branches/1.1/html/RTIR/Listing.html
Modified:
   rtir/branches/1.1/etc/RTIR_Config.pm
   rtir/branches/1.1/html/RTIR/Report/BulkReject.html
Log:
Convert BulkReject to the new format.

There are no more components using the old style search components, so delete them.



Modified: rtir/branches/1.1/etc/RTIR_Config.pm
==============================================================================
--- rtir/branches/1.1/etc/RTIR_Config.pm	(original)
+++ rtir/branches/1.1/etc/RTIR_Config.pm	Thu Sep  2 17:54:34 2004
@@ -98,4 +98,9 @@
 '<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__Subject__</a></B>/Title:Subject',
 __Requestors__,__OwnerName__,__CreatedRelative__});
 
+Set ($RTIRRejectSearchResultFormat, qq{___RTIR_Check__,
+'<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
+'<B><A HREF="$RT::WebPath/Ticket/Display.html?id=__id__">__Subject__</a></B>/Title:Subject',
+__Requestors__,__OwnerName__,__CreatedRelative__,__DueRelative__});
+
 1;

Modified: rtir/branches/1.1/html/RTIR/Report/BulkReject.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Report/BulkReject.html	(original)
+++ rtir/branches/1.1/html/RTIR/Report/BulkReject.html	Thu Sep  2 17:54:34 2004
@@ -42,8 +42,12 @@
 <input type=hidden name=Status value=<%$Status%>>
 <input type=hidden name=BulkReject value=1>
 
-<& /RTIR/Elements/Listing, 
-    url => "BulkReject.html?", Type => 'Incident Reports', check => $check, %ARGS &>
+<& /RTIR/Search/Elements/ShowResults, 
+    Queue => $Queue,
+    Query => $Query,
+    QueryString => $QueryString, 
+    BaseURL => $BaseURL,
+    %ARGS &>
 
 <a href="BulkReject.html?check=check">[Select All]</a>
 <a href="BulkReject.html?check=uncheck">[Unselect All]</a>
@@ -52,6 +56,9 @@
 </form>
 
 <%INIT>
+$Format = $RT::RTIRRejectSearchResultFormat;
+$ARGS{'Format'} = $Format;
+
 my $title = loc("Reject Incident Reports");
 my $SubmitCaption = loc("Reject selected incident reports");
 
@@ -94,12 +101,11 @@
     }
 }
 
+my @states = ['new'];
 if (!$Query) {
-    $Query = $m->comp('/RTIR/Elements/NewQuery', Queue => $Queue);
+    $Query = $m->comp('/RTIR/Elements/NewQuery', Queue => $Queue, states => @states);
 }
 
-$ARGS{'Query'} = $Query;
-
 my $QueryString = "&".$m->comp('/Elements/QueryString',
                                Query => $Query,
                                Format => $Format,
@@ -112,10 +118,16 @@
     $BaseQuery = $m->comp('/RTIR/Elements/BaseQuery', Queue => $Queue);
 }
 
-$Query = "'CF.Incident Reports.{_RTIR_State}' = 'new' AND $BaseQuery AND ( $Query )";
+$Query = "$BaseQuery AND ( $Query )";
+$ARGS{'Query'} = $Query;
 
-$session{'tickets'}->FromSQL($Query);
+my $refinetabs = { };
 
+$refinetabs->{'_a'} = {
+    class => "nav",
+    path => "RTIR/Search/RejectRefine.html?Queue=$Queue$QueryString",
+    title => loc('Refine') };
+	
 </%INIT>
 
 <%ARGS>
@@ -129,5 +141,5 @@
 $Page => 1
 $OrderBy => 'id'
 $Order => 'ASC'
+$BaseURL => "/RTIR/Report/BulkReject.html"
 </%ARGS>
-