[Rt-commit] r4707 - in rtir/branches/1.9-EXPERIMENTAL: etc
html/RTIR html/RTIR/Incident html/RTIR/Report
ruz at bestpractical.com
ruz at bestpractical.com
Tue Mar 7 00:05:03 EST 2006
Author: ruz
Date: Tue Mar 7 00:05:02 2006
New Revision: 4707
Modified:
rtir/branches/1.9-EXPERIMENTAL/ (props changed)
rtir/branches/1.9-EXPERIMENTAL/etc/RTIR_Config.pm
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Reply.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Report/BulkReject.html
Log:
r888 at cubic-pc: cubic | 2006-03-07 08:12:37 +0300
* move ___RTIR_{Radio,Check}__ from config
* don't pass them between pages, use them only when we need it
Modified: rtir/branches/1.9-EXPERIMENTAL/etc/RTIR_Config.pm
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/etc/RTIR_Config.pm (original)
+++ rtir/branches/1.9-EXPERIMENTAL/etc/RTIR_Config.pm Tue Mar 7 00:05:02 2006
@@ -177,35 +177,30 @@
__DueRelative__,
__TimeLeft__},
- Merge => qq{___RTIR_Radio__,
- '<b><a href="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></b>/TITLE:#',
+ Merge => qq{'<b><a href="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></b>/TITLE:#',
'<b><a href="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></b>/TITLE:Subject',
__Requestors__,
__OwnerName__,
__CreatedRelative__,
__DueRelative__},
- LinkChildren => qq{___RTIR_Check__,
- '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
+ LinkChildren => qq{'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
__Requestors__,
__OwnerName__,
__CreatedRelative__,
__DueRelative__},
- LinkIncident => qq{___RTIR_Radio__,
- '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
+ LinkIncident => qq{'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
__OwnerName__,
__CreatedRelative__},
- RejectReports, qq{___RTIR_Check__,
- '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
+ RejectReports, qq{'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
__Requestors__,__OwnerName__,__CreatedRelative__,__DueRelative__},
- BulkReply => qq{___RTIR_Check__,
- '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
+ BulkReply => qq{'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
__Requestors__,__OwnerName__,__CreatedRelative__,__DueRelative__},
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html Tue Mar 7 00:05:02 2006
@@ -48,7 +48,7 @@
Queue => $Queue,
BaseQuery => $BaseQuery,
Query => $Query,
- Format => $Format,
+ Format => '___RTIR_Check__,'. $Format,
Rows => $Rows,
OrderBy => $OrderBy,
Order => $Order,
@@ -90,7 +90,6 @@
);
my $title = loc('Abandon Incidents');
my $SubmitCaption = loc("Abandon selected incidents");
-$Format = "___RTIR_Check__,$Format" unless $Format =~ /___RTIR_Check__/;
my ( @results );
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html Tue Mar 7 00:05:02 2006
@@ -42,9 +42,13 @@
Queue => $Queue,
BaseQuery => $BaseQuery,
Query => $Query,
- QueryString => $QueryString,
+ Format => "___RTIR_Check__,". $Format,
+ Rows => $Rows,
+ Page => $Page,
+ OrderBy => $OrderBy,
+ Order => $Order,
BaseURL => $BaseURL,
- Format => $Format,
+ QueryString => $QueryString,
&>
<& /Elements/Submit, Name => "SubmitTicket", Caption => $title, Label => loc("Link") &>
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html Tue Mar 7 00:05:02 2006
@@ -48,7 +48,7 @@
BaseQuery => $BaseQuery,
Query => $Query,
BaseURL => $BaseURL,
- Format => $Format,
+ Format => '__RTIR_Radio__,'. $Format,
Rows => $Rows,
Page => $Page,
OrderBy => $OrderBy,
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Reply.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Reply.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Reply.html Tue Mar 7 00:05:02 2006
@@ -36,29 +36,37 @@
<form action="Reply.html" method="get">
<input type="hidden" name="id" value="<% $id %>" />
<input type="hidden" name="Status" value="<% $ARGS{'DefaultStatus'} %>" />
-<input type="hidden" name="All" value="<% $ARGS{'All'} %>" />
+<input type="hidden" name="All" value="<% $All %>" />
<input type="hidden" name="Query" value="<% $Query %>" />
<input type="hidden" name="BaseQuery" value="<% $BaseQuery %>" />
<h2><&|/l&>Reporters</&></h2>
<& /RTIR/Search/Elements/ShowResults,
+ Queue => 'Incident Reports',
BaseQuery => $BaseQuery,
Query => "($Query) AND Queue = 'Incident Reports'",
- QueryString => $QueryString,
+ Format => '___RTIR_Check__,'. $Format,
+ Rows => $Rows,
+ Page => $Page,
+ OrderBy => $OrderBy,
+ Order => $Order,
+ QueryString => $QueryString,
BaseURL => $BaseURL,
- Format => $Format,
- Rows => 0,
&>
% if ( $All ) {
<h2><&|/l&>Investigation Correspondents</&></h2>
<& /RTIR/Search/Elements/ShowResults,
+ Queue => 'Investigations',
BaseQuery => $BaseQuery,
Query => "($Query) AND Queue = 'Investigations'",
+ Format => '___RTIR_Check__,'. $Format,
+ Rows => $Rows,
+ Page => $Page,
+ OrderBy => $OrderBy,
+ Order => $Order,
QueryString => $QueryString,
BaseURL => $BaseURL,
- Format => $Format,
- Rows => 0,
&>
% }
@@ -84,13 +92,11 @@
Order => $Order,
Page => $Page);
-if (!$BaseQuery) {
+unless ( $BaseQuery ) {
$BaseQuery = "Queue = 'Incident Reports'";
$BaseQuery = "($BaseQuery OR Queue = 'Investigations')" if $All;
}
-$Query = "$BaseQuery AND ( $Query )";
-
my ($title, $SubmitCaption, $SubmitLabel);
if ($ARGS{'DefaultStatus'} eq 'resolved') {
$title = loc("Resolve Incident #[_1] (including children)", $id);
@@ -141,13 +147,10 @@
push @results, map { loc("Ticket [_1]: [_2]", $id, $_) } @tempresults;
}
- # shouldn't we record message into incident?
+ #XXX: shouldn't we record message into incident?
push @results, ProcessTicketBasics( TicketObj => $IncidentObj, ARGSRef => \%ARGS );
}
-#Iterate through each ticket we've been handed
-my $MyTickets = new RT::Tickets($session{'CurrentUser'});
-$MyTickets->FromSQL( $Query );
</%INIT>
<%ARGS>
@@ -157,8 +160,7 @@
$BaseQuery => undef
$Query => "CF.{_RTIR_State} = 'open' AND MemberOf = $id";
$Format => RT->Config->Get('RTIRSearchResultFormats')->{'BulkReply'};
-$HideResults => 0
-$Rows => 50
+$Rows => 0
$Page => 1
$OrderBy => 'id'
$Order => 'ASC'
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html Tue Mar 7 00:05:02 2006
@@ -55,7 +55,7 @@
Query => $Query,
QueryString => $QueryString,
BaseURL => RT->Config->Get('WebPath')."/RTIR/Merge.html?id=$id&",
- Format => $Format,
+ Format => '___RTIR_Radio__,'. $Format,
&>
<hr>
@@ -113,7 +113,6 @@
$BaseQuery => undef
$Query => undef
$Format => undef
-$HideResults => 0
$Rows => 50
$Page => 1
$OrderBy => 'id'
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Report/BulkReject.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Report/BulkReject.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Report/BulkReject.html Tue Mar 7 00:05:02 2006
@@ -45,7 +45,7 @@
Queue => $Queue,
BaseQuery => $BaseQuery,
Query => $Query,
- Format => $Format,
+ Format => '___RTIR_Check__,'. $Format,
Rows => $Rows,
Page => $Page,
OrderBy => $OrderBy,
@@ -74,8 +74,6 @@
my $title = loc("Reject Incident Reports");
my $SubmitCaption = loc("Reject selected incident reports");
-$Format = "___RTIR_Check__,$Format" unless $Format =~ /___RTIR_Check__/;
-
my ( @results );
if ( $BulkReject ) {
my @tempresults;
@@ -134,8 +132,7 @@
'/RTIR/Search/Results.html',
Queue => $Queue,
Query => $Query,
- # Skip format, since it contains checkbox
- # Format => $Format,
+ Format => $Format,
Rows => $Rows,
OrderBy => $OrderBy,
Order => $Order,
More information about the Rt-commit
mailing list