[Rt-commit] r6442 - in rtir/branches/2.1-EXPERIMENTAL: . html/RTIR
html/RTIR/Elements html/RTIR/Incident html/RTIR/Search
html/RTIR/Tools
ruz at bestpractical.com
ruz at bestpractical.com
Wed Nov 15 23:57:56 EST 2006
Author: ruz
Date: Wed Nov 15 23:57:54 2006
New Revision: 6442
Modified:
rtir/branches/2.1-EXPERIMENTAL/ (props changed)
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Advanced.html
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Create.html
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Display.html
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Edit.html
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/ChildSummary
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/IncidentSummary
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/MergeWith
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/QueueTabs
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/ShowChildren
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/ShowDates
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/Create.html
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/Display.html
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Merge.html
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Search/Elements/RefineTabs
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Search/Reporting.html
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Search/Results.html
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Split.html
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Tools/Lookup.html
rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Update.html
Log:
r1838 at cubic-pc: cubic | 2006-11-16 03:59:46 +0300
* switch to TicketType function
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Advanced.html
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Advanced.html (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Advanced.html Wed Nov 15 23:57:54 2006
@@ -85,7 +85,7 @@
Abort("No permission to view ticket");
}
-my ($Type) = $m->comp('Elements/Type', TicketObj => $Ticket);
+my $Type = RT::IR::TicketType( Ticket => $Ticket );
my $Title = loc("Advanced edit $Type #[_1]", $id);
</%INIT>
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Create.html
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Create.html (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Create.html Wed Nov 15 23:57:54 2006
@@ -318,7 +318,7 @@
my $QueueObj = new RT::Queue( $session{'CurrentUser'} );
$QueueObj->Load( $Queue ) || Abort( loc("Queue could not be loaded.") );
-my ($Type) = $m->comp('/RTIR/Elements/Type', Queue => $Queue );
+my $Type = RT::IR::TicketType( Queue => $Queue );
if ($Type eq 'Block' && RT->Config->Get('RTIR_DisableBlocksQueue') ) {
Abort(loc("Blocks queue is disabled via config file"));
}
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Display.html
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Display.html (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Display.html Wed Nov 15 23:57:54 2006
@@ -226,7 +226,7 @@
$QueueObj->Load($Queue) || Abort(loc("Queue could not be loaded."));
}
-my ($Type) = $m->comp('Elements/Type', Queue => $QueueObj->Name);
+my $Type = RT::IR::TicketType( Queue => $QueueObj );
return $m->comp( '/Ticket/Display.html', %ARGS ) unless $Type;
if ($Type eq 'Block' && RT->Config->Get('RTIR_DisableBlocksQueue') ) {
Abort(loc("Blocks queue is disabled via config file"));
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Edit.html
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Edit.html (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Edit.html Wed Nov 15 23:57:54 2006
@@ -223,7 +223,7 @@
my $Ticket = LoadTicket($id);
$id = $ARGS{'id'} = $Ticket->Id;
-my ($Type) = $m->comp('/RTIR/Elements/Type', TicketObj => $Ticket);
+my $Type = RT::IR::TicketType( Ticket => $Ticket );
return $m->comp( '/Ticket/Display.html', %ARGS ) unless $Type;
if( $Type eq 'Block' && RT->Config->Get('RTIR_DisableBlocksQueue') ) {
Abort(loc("Blocks queue is disabled via config file"));
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/ChildSummary
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/ChildSummary (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/ChildSummary Wed Nov 15 23:57:54 2006
@@ -37,7 +37,7 @@
% while (my $Ticket = $session{'tickets'}->Next) {
% next unless ($Ticket->QueueObj->Name eq $Queue);
% $i++;
-% my ($t) = $m->comp("/RTIR/Elements/Type", TicketObj => $Ticket);
+% my $t = RT::IR::TicketType( Ticket => $Ticket );
<tr class="<% $i%2 ? 'oddline' : 'evenline'%>" >
<td><b><a href="<%RT->Config->Get('WebPath')%>/RTIR/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Id%></a></b></td>
<td><b><a href="<%RT->Config->Get('WebPath')%>/RTIR/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Subject%></a></b></td>
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/IncidentSummary
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/IncidentSummary (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/IncidentSummary Wed Nov 15 23:57:54 2006
@@ -36,7 +36,7 @@
% foreach my $incident (sort keys %{$incidents}) {
% my $Ticket = $incidents->{$incident}->{'Ticket'};
% $i++;
-% my ($t) = $m->comp("/RTIR/Elements/Type", TicketObj => $Ticket);
+% my $t = RT::IR::TicketType( Ticket => $Ticket );
<tr class="<% $i%2 ? 'oddline' : 'evenline'%>" >
<td><b><a href="<%RT->Config->Get('WebPath')%>/RTIR/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Id%></a></b></td>
<td><b><a href="<%RT->Config->Get('WebPath')%>/RTIR/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Subject%></a></b></td>
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/MergeWith
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/MergeWith (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/MergeWith Wed Nov 15 23:57:54 2006
@@ -12,7 +12,7 @@
&>
<%INIT>
-my ($Type) = $m->comp( '/RTIR/Elements/Type', Queue => $Queue );
+my $Type = RT::IR::TicketType( Queue => $Queue );
$Title ||= $Type .'s';
$Query ||= $m->comp('/RTIR/Elements/NewQuery', Queue => $Queue);
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/QueueTabs
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/QueueTabs (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/QueueTabs Wed Nov 15 23:57:54 2006
@@ -44,7 +44,7 @@
}
$id = $Ticket->id if $Ticket;
-my ($Type) = $m->comp( '/RTIR/Elements/Type', Queue => $QueueName );
+my $Type = RT::IR::TicketType( Queue => $QueueName );
my $EscapedQueueName
= $m->comp( '/Elements/QueryString', Queue => $QueueName );
@@ -312,7 +312,7 @@
};
} elsif ( $Type eq 'Incident' ) {
if ( $Ticket && $Ticket->QueueObj->Name ne 'Incidents' ) {
- my ($childtype) = $m->comp( '/RTIR/Elements/Type', TicketObj => $Ticket );
+ my $childtype = RT::IR::TicketType( Ticket => $Ticket );
$tabs->{'h'} = {
title => loc( 'Link [_1] #[_2]', $childtype, $Ticket->Id ),
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/ShowChildren
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/ShowChildren (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/ShowChildren Wed Nov 15 23:57:54 2006
@@ -60,7 +60,7 @@
@States = ( $m->comp("/RTIR/Elements/States", Queue => $Queue), 'resolved', 'removed' );
}
my @possible_states = $m->comp("/RTIR/Elements/States", Queue => $Queue, Inactive => 1 );
-my ($Type) = $m->comp("/RTIR/Elements/Type", Queue => $Queue);
+my $Type = RT::IR::TicketType( Queue => $Queue );
$Format ||= RT->Config->Get('RTIRSearchResultFormats')->{'Child' . $Type};
if ($Delete) {
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/ShowDates
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/ShowDates (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Elements/ShowDates Wed Nov 15 23:57:54 2006
@@ -60,5 +60,5 @@
$Ticket => undef
</%ARGS>
<%INIT>
-my ($Type) = $m->comp( '/RTIR/Elements/Type', TicketObj => $Ticket );
+my $Type = RT::IR::TicketType( Ticket => $Ticket );
</%INIT>
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/Create.html
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/Create.html (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/Create.html Wed Nov 15 23:57:54 2006
@@ -65,13 +65,13 @@
<table border="0" cellpadding="0" cellspacing="2">
% if ( $TicketObj ) {
-% my ($Type) = $m->comp("/RTIR/Elements/Type", TicketObj => $TicketObj );
+% my $Type = RT::IR::TicketType( Ticket => $TicketObj );
<tr><td class="label"><% loc('Split from') %>:</td>
<td class="value"><% loc("[_1] #[_2]: [_3]", $Type, $TicketObj->Id, $TicketObj->Subject) %></td></tr>
% }
% if ( $ChildObj ) {
-% my ($Type) = $m->comp("/RTIR/Elements/Type", TicketObj => $ChildObj );
+% my $Type = RT::IR::TicketType( Ticket => $ChildObj );
<tr><td class="label"><% loc('Link with') %>:</td>
<td class="value"><% loc("[_1] #[_2]: [_3]", $Type, $ChildObj->Id, $ChildObj->Subject) %></td></tr>
% }
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/Display.html
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/Display.html (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/Display.html Wed Nov 15 23:57:54 2006
@@ -262,7 +262,7 @@
my %args = ();
# Blocks or Incedent Reports can have multiple incidents
- my ($Type) = $m->comp( '/RTIR/Elements/Type', TicketObj => $child );
+ my $Type = RT::IR::TicketType( Ticket => $child );
unless( $Type eq 'Block' || $Type eq 'Report' ) {
my $query = "Queue = 'Incidents' AND HasMember = ". $child->Id ." AND id != ". $parent->id;
my $incidents = RT::Tickets->new( $session{'CurrentUser'} );
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html Wed Nov 15 23:57:54 2006
@@ -61,7 +61,7 @@
my $IncidentObj = LoadTicket($id);
$ARGS{'id'} = $id = $IncidentObj->id;
-my ($Type) = $m->comp('/RTIR/Elements/Type', Queue => $Queue);
+my $Type = RT::IR::TicketType( Queue => $Queue );
my $title = loc("Link selected [_1] to Incident #[_2]", $Type, $id);
# XXX: clear radio, checkboxes from format
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html Wed Nov 15 23:57:54 2006
@@ -64,7 +64,7 @@
my $ChildObj = LoadTicket($id);
$ARGS{'id'} = $id = $ChildObj->id;
-my ($Type) = $m->comp( '/RTIR/Elements/Type', TicketObj => $ChildObj );
+my $Type = RT::IR::TicketType( Ticket => $ChildObj );
my $title = loc( "Link [_1] #[_2] to selected Incident", $Type, $id );
# XXX: clear radio, checkboxes from format
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Merge.html
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Merge.html (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Merge.html Wed Nov 15 23:57:54 2006
@@ -93,7 +93,7 @@
}
}
-my ($Type) = $m->comp( '/RTIR/Elements/Type', TicketObj => $Ticket );
+my $Type = RT::IR::TicketType( Ticket => $Ticket );
my $Queue = $Ticket->QueueObj->Name;
# XXX: clear radio, checkboxes from format
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Search/Elements/RefineTabs
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Search/Elements/RefineTabs (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Search/Elements/RefineTabs Wed Nov 15 23:57:54 2006
@@ -33,8 +33,8 @@
($id, $Queue) = @ARGS{'id', 'Queue'} = @args{'id', 'Queue'};
}
-my ($QueueType) = $m->comp('/RTIR/Elements/Type', Queue => $Queue );
-my ($TicketType) = $m->comp('/RTIR/Elements/Type', Ticket => $id, TicketObj => $Ticket );
+my $QueueType = RT::IR::TicketType( Queue => $Queue );
+my $TicketType = RT::IR::TicketType( Ticket => $Ticket || $id );
my $Type = $TicketType || $QueueType;
my %appendable_tab = (
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Search/Reporting.html
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Search/Reporting.html (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Search/Reporting.html Wed Nov 15 23:57:54 2006
@@ -30,7 +30,7 @@
<%INIT>
my $title = loc('Reporting');
-my ($Type) = $m->comp( '/RTIR/Elements/Type', Queue => $Queue );
+my $Type = RT::IR::TicketType( Queue => $Queue );
my $FullQuery = join ' AND ', map "( $_ )", grep $_, $BaseQuery, $Query;
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Search/Results.html
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Search/Results.html (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Search/Results.html Wed Nov 15 23:57:54 2006
@@ -83,7 +83,7 @@
<%INIT>
my $title = loc("Results");
-my $Type = ($m->comp( '/RTIR/Elements/Type', Queue => $Queue ))[0] || '';
+my $Type = RT::IR::TicketType( Queue => $Queue ) || '';
$Format ||= RT->Config->Get('RTIRSearchResultFormats')->{ $Type . 'Default' };
if ( $Type ) {
$BaseQuery ||= $m->comp( '/RTIR/Elements/BaseQuery', Queue => $Queue );
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Split.html
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Split.html (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Split.html Wed Nov 15 23:57:54 2006
@@ -46,7 +46,7 @@
<%INIT>
my $TicketObj = LoadTicket( $Ticket );
-my ($Type) = $m->comp('Elements/Type', TicketObj => $TicketObj );
+my $Type = RT::IR::TicketType( Ticket => $TicketObj );
if ( $m->comp_exists("/RTIR/$Type/Split.html") ) {
return $m->comp( "/RTIR/$Type/Split.html", %ARGS );
}
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Tools/Lookup.html
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Tools/Lookup.html (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Tools/Lookup.html Wed Nov 15 23:57:54 2006
@@ -244,7 +244,7 @@
if ( $ticket ) {
$TicketObj = LoadTicket( $ticket );
$ticket = $ARGS{'ticket'} = $TicketObj->id;
- ($TicketType) = $m->comp('/RTIR/Elements/Type', TicketObj => $TicketObj);
+ $TicketType = RT::IR::TicketType( Ticket => $TicketObj );
}
my $Format = RT->Config->Get('RTIRSearchResultFormats')->{$TicketType . 'Default'};
Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Update.html
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Update.html (original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Update.html Wed Nov 15 23:57:54 2006
@@ -108,7 +108,7 @@
my $Ticket = LoadTicket($id);
$id = $ARGS{'id'} = $Ticket->Id;
-my ($Type) = $m->comp( 'Elements/Type', TicketObj => $Ticket );
+my $Type = RT::IR::TicketType( Ticket => $Ticket );
my $name;
if ($Type eq 'Report') {
More information about the Rt-commit
mailing list