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

[leira at pallas.eruditorum.org]

Author: leira
Date: Wed Sep  1 01:43:01 2004
New Revision: 1390

Modified:
   rtir/branches/1.1/etc/RTIR_Config.pm
   rtir/branches/1.1/html/RTIR/Merge.html
   rtir/branches/1.1/html/RTIR/Search/Elements/ShowResults
   rtir/branches/1.1/html/RTIR/Search/Results.html
Log:
Merge now uses all new components.


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	Wed Sep  1 01:43:01 2004
@@ -81,5 +81,11 @@
 
 Set($RTIR_OldestRelatedTickets, 60);
 
+# Default formats for RTIR search results
+
+Set ($RTIRMergeSearchResultFormat, qq{___RTIR_Radio__,
+'<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/Merge.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Merge.html	(original)
+++ rtir/branches/1.1/html/RTIR/Merge.html	Wed Sep  1 01:43:01 2004
@@ -47,6 +47,7 @@
     Queue => $Queue,
     QueryString => $QueryString, 
     BaseURL => $RT::WebPath."/RTIR/Merge.html?id=$id&",
+    Format => $Format,
     %ARGS &>
 
 <HR>
@@ -55,6 +56,8 @@
 </form>
 
 <%INIT>
+$Format = $RT::RTIRMergeSearchResultFormat;
+
 my $Ticket = LoadTicket($id);
 my $Queue = $Ticket->QueueObj->Name;
 

Modified: rtir/branches/1.1/html/RTIR/Search/Elements/ShowResults
==============================================================================
--- rtir/branches/1.1/html/RTIR/Search/Elements/ShowResults	(original)
+++ rtir/branches/1.1/html/RTIR/Search/Elements/ShowResults	Wed Sep  1 01:43:01 2004
@@ -1,4 +1,4 @@
-<& /RTIR/Elements/TicketList, 
+<& /Elements/TicketList, 
     Query => $Query,
     AllowSorting => 1,
     OrderBy => $OrderBy,

Modified: rtir/branches/1.1/html/RTIR/Search/Results.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Search/Results.html	(original)
+++ rtir/branches/1.1/html/RTIR/Search/Results.html	Wed Sep  1 01:43:01 2004
@@ -91,7 +91,7 @@
 
 my $QueryString = "&".$m->comp('/Elements/QueryString',
                                Query => $Query,
-                               Format => $Format,
+                               Format => $Format . ',__Check__',
                                Rows => $Rows,
                                OrderBy => $OrderBy,
                                Order => $Order,