[Rt-commit] [svn] r1465 - in rtir/branches/1.1: etc html/RTIR
html/RTIR/Incident html/RTIR/Report html/RTIR/Search
leira at pallas.eruditorum.org
leira at pallas.eruditorum.org
Thu Sep 9 02:01:31 EDT 2004
Author: leira
Date: Thu Sep 9 02:01:30 2004
New Revision: 1465
Modified:
rtir/branches/1.1/etc/RTIR_Config.pm
rtir/branches/1.1/html/RTIR/Incident/LinkChildren.html
rtir/branches/1.1/html/RTIR/Incident/LinkToIncident.html
rtir/branches/1.1/html/RTIR/Incident/Reply.html
rtir/branches/1.1/html/RTIR/Merge.html
rtir/branches/1.1/html/RTIR/Report/BulkReject.html
rtir/branches/1.1/html/RTIR/Search/Results.html
Log:
Define default search result formats and use 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 9 02:01:30 2004
@@ -82,30 +82,98 @@
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__});
-
-Set ($RTIRLinkSearchResultFormat, 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__});
-
-Set ($RTIRLinkIncidentSearchResultFormat, 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__});
-
-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__});
-
-Set ($RTIRBulkReplyResultFormat, 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__});
+Set($RTIRSearchResultFormats, {
+ ReportDefault => qq{'<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',
+ '__CustomField.Incident Reports.{_RTIR_State}__/Title:State',
+ __LastUpdatedRelative__,
+ __CreatedRelative__,
+ __NEWLINE__,
+ __Requestors__,
+ __OwnerName__,
+ __ToldRelative__,
+ __DueRelative__,
+ __TimeLeft__},
+
+ ReportDefault => qq{'<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',
+ '__CustomField.Incident Reports.{_RTIR_State}__/Title:State',
+ __LastUpdatedRelative__,
+ __CreatedRelative__,
+ __NEWLINE__,
+ __Requestors__,
+ __OwnerName__,
+ __ToldRelative__,
+ __DueRelative__,
+ __TimeLeft__},
+
+ InvestigationDefault => qq{'<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',
+ '__CustomField.Incident Reports.{_RTIR_State}__/Title:State',
+ __LastUpdatedRelative__,
+ __CreatedRelative__,
+ __NEWLINE__,
+ __Requestors__,
+ __OwnerName__,
+ __ToldRelative__,
+ __DueRelative__,
+ __TimeLeft__},
+
+ BlockDefault => qq{'<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',
+ '__CustomField.Incident Reports.{_RTIR_State}__/Title:State',
+ __LastUpdatedRelative__,
+ __CreatedRelative__,
+ __NEWLINE__,
+ __Requestors__,
+ __OwnerName__,
+ __ToldRelative__,
+ __DueRelative__,
+ __TimeLeft__},
+
+ IncidentDefault => qq{'<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',
+ '__CustomField.Incident Reports.{_RTIR_State}__/Title:State',
+ __LastUpdatedRelative__,
+ __CreatedRelative__,
+ __Priority__,
+ __NEWLINE__,
+ __OwnerName__,
+ __ToldRelative__,
+ __DueRelative__,
+ __TimeLeft__},
+
+ Merge => 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__},
+
+ LinkChildren => 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__},
+
+ LinkIncident => 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__},
+
+ RejectReports, 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__},
+
+ BulkReply => 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/Incident/LinkChildren.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Incident/LinkChildren.html (original)
+++ rtir/branches/1.1/html/RTIR/Incident/LinkChildren.html Thu Sep 9 02:01:30 2004
@@ -53,7 +53,7 @@
my $IncidentObj = LoadTicket($id);
my $SubmitCaption = loc("Link selected with Incident #[_1]", $IncidentObj->id);
-$Format = $RT::RTIRLinkSearchResultFormat;
+$Format = $RT::RTIRSearchResultFormats->{'LinkChildren'};
my $TicketObj = new RT::Ticket($session{'CurrentUser'});
$TicketObj->Load($id);
@@ -83,7 +83,6 @@
$title = loc("Link selected [_1] to Incident #[_2]", $Queue, $IncidentObj->Id);
}
-$m->print("original Query: $Query<br>");
if (!$Query) {
$Query = $m->comp('/RTIR/Elements/NewQuery', Queue => $Queue);
}
Modified: rtir/branches/1.1/html/RTIR/Incident/LinkToIncident.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Incident/LinkToIncident.html (original)
+++ rtir/branches/1.1/html/RTIR/Incident/LinkToIncident.html Thu Sep 9 02:01:30 2004
@@ -57,7 +57,7 @@
<HR>
<%INIT>
-$Format = $RT::RTIRLinkIncidentSearchResultFormat;
+$Format = $RT::RTIRSearchResultFormats->{'LinkIncident'};
my ($Type, undef) = $m->comp('/RTIR/Elements/Type', Queue => 'Incidents');
Modified: rtir/branches/1.1/html/RTIR/Incident/Reply.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Incident/Reply.html (original)
+++ rtir/branches/1.1/html/RTIR/Incident/Reply.html Thu Sep 9 02:01:30 2004
@@ -121,7 +121,7 @@
</form>
<%INIT>
-$Format = $RT::RTIRBulkReplyResultFormat;
+$Format = $RT::RTIRSearchResultFormats->{'BulkReply'};
my $IncidentObj = LoadTicket($id);
my ($title, $ticketcount, $found);
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 Thu Sep 9 02:01:30 2004
@@ -64,7 +64,7 @@
</form>
<%INIT>
-$Format = $RT::RTIRMergeSearchResultFormat;
+$Format = $RT::RTIRSearchResultFormats->{'Merge'};
my $Ticket = LoadTicket($id);
my $Queue = $Ticket->QueueObj->Name;
@@ -112,7 +112,7 @@
<%ARGS>
$BaseQuery => undef
$Query => undef
-$Format => $RT::RTIRMergeSearchResultFormat
+$Format => undef
$HideResults => 0
$Rows => 50
$Page => 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 9 02:01:30 2004
@@ -61,7 +61,7 @@
</form>
<%INIT>
-$Format = $RT::RTIRRejectSearchResultFormat;
+$Format = $RT::RTIRSearchResultFormats->{'RejectReports'};
my $title = loc("Reject Incident Reports");
my $SubmitCaption = loc("Reject selected incident reports");
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 Thu Sep 9 02:01:30 2004
@@ -59,11 +59,12 @@
<& Elements/ShowResults,
Query => $Query,
QueryString => $QueryString,
- %ARGS
+ Format => $Format,
&>
<%INIT>
my ($Type, @states) = $m->comp("/RTIR/Elements/Type", Queue => $Queue);
+$Format = $RT::RTIRSearchResultFormats->{$Type . 'Default'};
my $title = loc("Results");
More information about the Rt-commit
mailing list