[Rt-commit] r7260 - in rtir/branches/2.3-EXPERIMENTAL/html/RTIR: .
Elements Incident
ruz at bestpractical.com
ruz at bestpractical.com
Fri Mar 16 18:48:26 EDT 2007
Author: ruz
Date: Fri Mar 16 18:48:25 2007
New Revision: 7260
Modified:
rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Elements/MergeWith
rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Elements/ShowChildren
rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html
rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html
rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Reply.html
rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Merge.html
rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Report/BulkReject.html
Log:
* use DisplayForm for checkboxes and radio buttons
Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Elements/MergeWith
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Elements/MergeWith (original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Elements/MergeWith Fri Mar 16 18:48:25 2007
@@ -1,14 +1,15 @@
<h3><% $Title %></h3>
<& /RTIR/Search/Elements/ShowResults,
- Queue => $Queue,
- BaseQuery => $BaseQuery,
- Query => $Query,
- Format => '__RTIR_Radio__,'. $Format,
- Rows => $Rows,
- Page => $Page,
- OrderBy => $OrderBy,
- Order => $Order,
- BaseURL => "RTIR/Merge.html?id=$id",
+ Queue => $Queue,
+ BaseQuery => $BaseQuery,
+ Query => $Query,
+ DisplayFormat => "__RTIR_Radio__, $Format",
+ Format => $Format,
+ Rows => $Rows,
+ Page => $Page,
+ OrderBy => $OrderBy,
+ Order => $Order,
+ BaseURL => "RTIR/Merge.html?id=$id",
&>
<%INIT>
@@ -21,9 +22,6 @@
$BaseQuery = join ' AND ', map "( $_ )", grep $_, $BaseQuery, " id != $id";
}
-# XXX: clear radio, checkboxes from format
-$Format =~ s/__RTIR_(?:Radio|Check)__,//;
-
</%INIT>
<%ARGS>
Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Elements/ShowChildren
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Elements/ShowChildren (original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Elements/ShowChildren Fri Mar 16 18:48:25 2007
@@ -35,11 +35,12 @@
<i><% loc("Check box to unlink") %></i><br />
% }
<& /Elements/TicketList,
- Collection => $children,
- Format => $Format,
- Rows => $Rows,
- ShowHeader => $ShowHeader,
- OrderBy => $OrderBy,
+ Collection => $children,
+ DisplayFormat => ($Delete? "__RTIR_Check__, $Format": $Format),
+ Format => $Format,
+ Rows => $Rows,
+ ShowHeader => $ShowHeader,
+ OrderBy => $OrderBy,
ShowNavigation => 0,
&>
% unless( $children->Count ) {
@@ -63,9 +64,6 @@
my $Type = RT::IR::TicketType( Queue => $Queue );
$Format ||= RT->Config->Get('RTIRSearchResultFormats')->{'Child' . $Type};
-if ($Delete) {
- $Format = "__RTIR_Check__, " . $Format;
-}
my $children = RT::Tickets->new( $session{'CurrentUser'} );
$children->FromSQL( $m->comp( '/RTIR/Elements/ChildrenQuery',
Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html (original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html Fri Mar 16 18:48:25 2007
@@ -39,15 +39,16 @@
<%PERL>
# XXX: cache result set to check if get empty results
my $result_set = $m->scomp('/RTIR/Search/Elements/ShowResults',
- Queue => $Queue,
- BaseURL => $BaseURL,
- BaseQuery => $BaseQuery,
- Query => $Query,
- Format => '__RTIR_Check__,'. $Format,
- Rows => $Rows,
- OrderBy => $OrderBy,
- Order => $Order,
- Page => $Page,
+ Queue => $Queue,
+ BaseURL => $BaseURL,
+ BaseQuery => $BaseQuery,
+ Query => $Query,
+ DisplayFormat => "__RTIR_Check__, $Format",
+ Format => $Format,
+ Rows => $Rows,
+ OrderBy => $OrderBy,
+ Order => $Order,
+ Page => $Page,
);
</%PERL>
Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html (original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html Fri Mar 16 18:48:25 2007
@@ -43,15 +43,16 @@
<input type="hidden" name="BulkLink" value="1" />
<& /RTIR/Search/Elements/ShowResults,
- Queue => $Queue,
- BaseQuery => $BaseQuery,
- Query => $Query,
- Format => "__RTIR_Check__,". $Format,
- Rows => $Rows,
- Page => $Page,
- OrderBy => $OrderBy,
- Order => $Order,
- BaseURL => $current_tab,
+ Queue => $Queue,
+ BaseQuery => $BaseQuery,
+ Query => $Query,
+ DisplayFormat => "__RTIR_Check__, $Format",
+ Format => $Format,
+ Rows => $Rows,
+ Page => $Page,
+ OrderBy => $OrderBy,
+ Order => $Order,
+ BaseURL => $current_tab,
&>
<& /Elements/Submit, Name => "SubmitTicket", Caption => $title, Label => loc("Link") &>
@@ -64,9 +65,6 @@
my $Type = RT::IR::TicketType( Queue => $Queue );
my $title = loc("Link selected [_1] to Incident #[_2]", $Type, $id);
-# XXX: clear radio, checkboxes from format
-$Format =~ s/__RTIR_(?:Radio|Check)__,//;
-
my $QueryString = $m->comp('/Elements/QueryString',
Query => $Query,
Format => $Format,
Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Reply.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Reply.html (original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Reply.html Fri Mar 16 18:48:25 2007
@@ -46,42 +46,45 @@
<h2><&|/l&>Reporters</&></h2>
<& /RTIR/Search/Elements/ShowResults,
- Queue => 'Incident Reports',
- BaseURL => $current_tab,
- BaseQuery => $BaseQuery{'Incident Reports'},
- Query => $Query,
- Format => '__RTIR_Check__,'. $Format,
- Rows => $Rows,
- Page => $Page,
- OrderBy => $OrderBy,
- Order => $Order,
+ Queue => 'Incident Reports',
+ BaseURL => $current_tab,
+ BaseQuery => $BaseQuery{'Incident Reports'},
+ Query => $Query,
+ DisplayFormat => "__RTIR_Check__, $Format",
+ Format => $Format,
+ Rows => $Rows,
+ Page => $Page,
+ OrderBy => $OrderBy,
+ Order => $Order,
&>
% if ( $All ) {
<h2><&|/l&>Investigation Correspondents</&></h2>
<& /RTIR/Search/Elements/ShowResults,
- Queue => 'Investigations',
- BaseURL => $current_tab,
- BaseQuery => $BaseQuery{'Investigations'},
- Query => $Query,
- Format => '__RTIR_Check__,'. $Format,
- Rows => $Rows,
- Page => $Page,
- OrderBy => $OrderBy,
- Order => $Order,
+ Queue => 'Investigations',
+ BaseURL => $current_tab,
+ BaseQuery => $BaseQuery{'Investigations'},
+ Query => $Query,
+ DisplayFormat => "__RTIR_Check__, $Format",
+ Format => $Format,
+ Rows => $Rows,
+ Page => $Page,
+ OrderBy => $OrderBy,
+ Order => $Order,
&>
% unless( RT->Config->Get('RTIR_DisableBlocksQueue') ) {
<h2><&|/l&>Blocks Correspondents</&></h2>
<& /RTIR/Search/Elements/ShowResults,
- Queue => 'Investigations',
- BaseURL => $current_tab,
- BaseQuery => $BaseQuery{'Blocks'},
- Query => $Query,
- Format => '__RTIR_Check__,'. $Format,
- Rows => $Rows,
- Page => $Page,
- OrderBy => $OrderBy,
- Order => $Order,
+ Queue => 'Investigations',
+ BaseURL => $current_tab,
+ BaseQuery => $BaseQuery{'Blocks'},
+ Query => $Query,
+ DisplayFormat => "__RTIR_Check__, $Format",
+ Format => $Format,
+ Rows => $Rows,
+ Page => $Page,
+ OrderBy => $OrderBy,
+ Order => $Order,
&>
% }
% }
@@ -97,9 +100,6 @@
my $IncidentObj = LoadTicket( $id );
$id = $ARGS{'id'} = $IncidentObj->id;
-# XXX: clear radio, checkboxes from format
-$Format =~ s/__RTIR_(?:Radio|Check)__,//;
-
# XXX: we should get rid of DefaultStatus argument at all. use Status
$Status ||= $DefaultStatus; $DefaultStatus ||= $Status;
Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Merge.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Merge.html (original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Merge.html Fri Mar 16 18:48:25 2007
@@ -96,9 +96,6 @@
my $Type = RT::IR::TicketType( Ticket => $Ticket );
my $Queue = $Ticket->QueueObj->Name;
-# XXX: clear radio, checkboxes from format
-$Format =~ s/__RTIR_(?:Radio|Check)__,//;
-
my $title = loc("Merge [_1] #[_2]: [_3]", $Type, $id, $Ticket->Subject);
$Query ||= $m->comp('/RTIR/Elements/NewQuery', Queue => $Queue);
Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Report/BulkReject.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Report/BulkReject.html (original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Report/BulkReject.html Fri Mar 16 18:48:25 2007
@@ -43,15 +43,16 @@
<input type="hidden" name="Order" value="<% $Order %>" />
<& /RTIR/Search/Elements/ShowResults,
- Queue => $Queue,
- BaseURL => $BaseURL,
- BaseQuery => $BaseQuery,
- Query => $Query,
- Format => '__RTIR_Check__,'. $Format,
- Rows => $Rows,
- Page => $Page,
- OrderBy => $OrderBy,
- Order => $Order,
+ Queue => $Queue,
+ BaseURL => $BaseURL,
+ BaseQuery => $BaseQuery,
+ Query => $Query,
+ DisplayFormat => "__RTIR_Check__, $Format",
+ Format => $Format,
+ Rows => $Rows,
+ Page => $Page,
+ OrderBy => $OrderBy,
+ Order => $Order,
ShowNavigation => 1,
ShowListActions => 0,
&>
@@ -76,9 +77,6 @@
<%INIT>
my $title = loc("Reject Incident Reports");
-# XXX: clear radio, checkboxes from format
-$Format =~ s/__RTIR_(?:Radio|Check)__,//;
-
my ( @results );
if ( $BulkReject ) {
my @tempresults;
More information about the Rt-commit
mailing list