[Rt-commit] r19301 - in rtir/2.5/trunk: html/Callbacks/RTIR/Elements/EditCustomField html/Callbacks/RTIR/Elements/MakeClicky html/Callbacks/RTIR/Elements/RT__Ticket/ColumnMap html/Callbacks/RTIR/Ticket/Elements/ShowHistory html/RTIR html/RTIR/Block/Elements html/RTIR/Elements html/RTIR/Incident html/RTIR/Report html/RTIR/Reporting html/RTIR/Tools lib/RT lib/RT/Action lib/RT/Condition lib/RT/IR t t/constituency
ruz at bestpractical.com
ruz at bestpractical.com
Mon Apr 20 12:37:43 EDT 2009
Author: ruz
Date: Mon Apr 20 12:37:43 2009
New Revision: 19301
Modified:
rtir/2.5/trunk/html/Callbacks/RTIR/Elements/EditCustomField/EditComponentName
rtir/2.5/trunk/html/Callbacks/RTIR/Elements/MakeClicky/Default
rtir/2.5/trunk/html/Callbacks/RTIR/Elements/RT__Ticket/ColumnMap/Once
rtir/2.5/trunk/html/Callbacks/RTIR/Ticket/Elements/ShowHistory/SkipTransaction
rtir/2.5/trunk/html/RTIR/Block/Elements/EditState
rtir/2.5/trunk/html/RTIR/Create.html
rtir/2.5/trunk/html/RTIR/Display.html
rtir/2.5/trunk/html/RTIR/Edit.html
rtir/2.5/trunk/html/RTIR/Elements/AttachReports
rtir/2.5/trunk/html/RTIR/Elements/ChildSummary
rtir/2.5/trunk/html/RTIR/Elements/IncidentSummary
rtir/2.5/trunk/html/RTIR/Elements/MergeWith
rtir/2.5/trunk/html/RTIR/Elements/NewQuery
rtir/2.5/trunk/html/RTIR/Elements/QueueSummary
rtir/2.5/trunk/html/RTIR/Elements/QueueTabs
rtir/2.5/trunk/html/RTIR/Elements/ShowIncidents
rtir/2.5/trunk/html/RTIR/Incident/BulkAbandon.html
rtir/2.5/trunk/html/RTIR/Incident/Create.html
rtir/2.5/trunk/html/RTIR/Incident/Display.html
rtir/2.5/trunk/html/RTIR/Incident/Edit.html
rtir/2.5/trunk/html/RTIR/Incident/Elements/Create
rtir/2.5/trunk/html/RTIR/Incident/Elements/ReplyForm
rtir/2.5/trunk/html/RTIR/Incident/LinkChildren.html
rtir/2.5/trunk/html/RTIR/Incident/LinkToIncident.html
rtir/2.5/trunk/html/RTIR/Incident/Reply.html
rtir/2.5/trunk/html/RTIR/Merge.html
rtir/2.5/trunk/html/RTIR/Report/BulkReject.html
rtir/2.5/trunk/html/RTIR/Reporting/Report.html
rtir/2.5/trunk/html/RTIR/Tools/Lookup.html
rtir/2.5/trunk/lib/RT/Action/RTIR_FindIP.pm
rtir/2.5/trunk/lib/RT/Action/RTIR_MergeIPs.pm
rtir/2.5/trunk/lib/RT/Action/RTIR_SetBlockState.pm
rtir/2.5/trunk/lib/RT/Action/RTIR_SetConstituency.pm
rtir/2.5/trunk/lib/RT/Action/RTIR_SetConstituencyGroup.pm
rtir/2.5/trunk/lib/RT/Action/RTIR_SetDueBySLA.pm
rtir/2.5/trunk/lib/RT/Action/RTIR_SetHowReported.pm
rtir/2.5/trunk/lib/RT/Action/RTIR_SetIncidentResolution.pm
rtir/2.5/trunk/lib/RT/Action/RTIR_SetState.pm
rtir/2.5/trunk/lib/RT/Condition/RTIR_BlockActivation.pm
rtir/2.5/trunk/lib/RT/Condition/RTIR_RequireConstituencyChange.pm
rtir/2.5/trunk/lib/RT/Condition/RTIR_RequireConstituencyGroupChange.pm
rtir/2.5/trunk/lib/RT/IR.pm
rtir/2.5/trunk/lib/RT/IR/AdministrationTutorial.pod
rtir/2.5/trunk/lib/RT/IR/Constituencies.pod
rtir/2.5/trunk/lib/RT/IR/Ticket.pm
rtir/2.5/trunk/t/013-custom-field-ip.t
rtir/2.5/trunk/t/020-incident-and-investigation.t
rtir/2.5/trunk/t/constituency/acl.t
rtir/2.5/trunk/t/constituency/basics.t
rtir/2.5/trunk/t/constituency/email.t
rtir/2.5/trunk/t/constituency/email_outgoing.t
rtir/2.5/trunk/t/constituency/propagation-inherit.t
rtir/2.5/trunk/t/constituency/propagation-no.t
rtir/2.5/trunk/t/constituency/propagation-reject.t
rtir/2.5/trunk/t/rtir-test.pl
Log:
* strip most of _RTIR_ prefixes from code
Modified: rtir/2.5/trunk/html/Callbacks/RTIR/Elements/EditCustomField/EditComponentName
==============================================================================
--- rtir/2.5/trunk/html/Callbacks/RTIR/Elements/EditCustomField/EditComponentName (original)
+++ rtir/2.5/trunk/html/Callbacks/RTIR/Elements/EditCustomField/EditComponentName Mon Apr 20 12:37:43 2009
@@ -1,5 +1,5 @@
<%init>
-return unless ($CustomField->Name eq '_RTIR_Constituency');
+return unless ($CustomField->Name eq 'Constituency');
$$Name = '/RTIR/Elements/EditConstituency';
</%init>
Modified: rtir/2.5/trunk/html/Callbacks/RTIR/Elements/MakeClicky/Default
==============================================================================
--- rtir/2.5/trunk/html/Callbacks/RTIR/Elements/MakeClicky/Default (original)
+++ rtir/2.5/trunk/html/Callbacks/RTIR/Elements/MakeClicky/Default Mon Apr 20 12:37:43 2009
@@ -41,7 +41,7 @@
$result .= qq{[<a href="$web_path/RTIR/Create.html?Incident=$args{incident}&Queue=Blocks&IP-Value=$args{host}">block</a>]};
}
if ( $args{'ticket'} && $args{'ticket'}->id ) {
- my $cf = RT::IR::GetCustomField('_RTIR_IP');
+ my $cf = RT::IR::GetCustomField('IP');
my $tid = $args{'ticket'}->id;
$result .= qq{[<a href="$web_path/RTIR/Edit.html?id=$tid}
.qq{&Object-RT::Ticket-$tid-CustomField-}. $cf->id .qq{-AddValue=}
Modified: rtir/2.5/trunk/html/Callbacks/RTIR/Elements/RT__Ticket/ColumnMap/Once
==============================================================================
--- rtir/2.5/trunk/html/Callbacks/RTIR/Elements/RT__Ticket/ColumnMap/Once (original)
+++ rtir/2.5/trunk/html/Callbacks/RTIR/Elements/RT__Ticket/ColumnMap/Once Mon Apr 20 12:37:43 2009
@@ -49,7 +49,7 @@
my $t = shift;
my $yesno;
- my $query = "Queue = 'Incidents' AND HasMember = " . $t->Id . " AND CF.{_RTIR_State} != 'rejected'";
+ my $query = "Queue = 'Incidents' AND HasMember = " . $t->Id . " AND CF.{State} != 'rejected'";
my $incidents = new RT::Tickets($session{'CurrentUser'});
$incidents->FromSQL($query);
Modified: rtir/2.5/trunk/html/Callbacks/RTIR/Ticket/Elements/ShowHistory/SkipTransaction
==============================================================================
--- rtir/2.5/trunk/html/Callbacks/RTIR/Ticket/Elements/ShowHistory/SkipTransaction (original)
+++ rtir/2.5/trunk/html/Callbacks/RTIR/Ticket/Elements/ShowHistory/SkipTransaction Mon Apr 20 12:37:43 2009
@@ -7,9 +7,9 @@
my $type = $Transaction->Type;
-# skip _RTIR_IP changes done by system user(scrips)
+# skip IP changes done by system user(scrips)
if ( $Transaction->Creator == $RT::SystemUser->id && $type eq 'CustomField' ) {
- my $cf = RT::IR::GetCustomField('_RTIR_IP')
+ my $cf = RT::IR::GetCustomField('IP')
or return;
return unless $cf->id == $Transaction->Field;
return $$skip = 1;
Modified: rtir/2.5/trunk/html/RTIR/Block/Elements/EditState
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Block/Elements/EditState (original)
+++ rtir/2.5/trunk/html/RTIR/Block/Elements/EditState Mon Apr 20 12:37:43 2009
@@ -16,6 +16,6 @@
</%ARGS>
<%INIT>
if ( $Default eq 'open' ) {
- $Default = 'new' unless $TicketObj->FirstCustomFieldValue('_RTIR_State') eq 'active';
+ $Default = 'new' unless $TicketObj->FirstCustomFieldValue('State') eq 'active';
}
</%INIT>
Modified: rtir/2.5/trunk/html/RTIR/Create.html
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Create.html (original)
+++ rtir/2.5/trunk/html/RTIR/Create.html Mon Apr 20 12:37:43 2009
@@ -149,7 +149,7 @@
<td class="value" colspan="2">
% if ( !$Incident || RT->Config->Get('_RTIR_Constituency_Propagation') eq 'no' ) {
% my $default;
-% $default = $IncidentObj->FirstCustomFieldValue('_RTIR_Constituency') if $Incident;
+% $default = $IncidentObj->FirstCustomFieldValue('Constituency') if $Incident;
% $default ||= RT::IR::DefaultConstituency( $QueueObj );
% $default ||= scalar RT->Config->Get('_RTIR_Constituency_default');
<& /RTIR/Elements/EditRTIRField,
@@ -159,10 +159,10 @@
% } else {
% #TODO: hacks, we need way to define CF value on Create, but don't allow user to change it
% my $cf = RT::CustomField->new( $RT::SystemUser );
-% $cf->LoadByNameAndQueue( Name => '_RTIR_Constituency', Queue => $Queue );
+% $cf->LoadByNameAndQueue( Name => 'Constituency', Queue => $Queue );
<input type="hidden" class="hidden" name="Constituency" value="Object-RT::Ticket--CustomField-<% $cf->id %>-Values" />
<input type="hidden" class="hidden" name="Object-RT::Ticket--CustomField-<% $cf->id %>-Values-Magic" value="1" />
- <input type="hidden" class="hidden" name="Object-RT::Ticket--CustomField-<% $cf->id %>-Values" value="<% $IncidentObj->FirstCustomFieldValue('_RTIR_Constituency') %>" />
+ <input type="hidden" class="hidden" name="Object-RT::Ticket--CustomField-<% $cf->id %>-Values" value="<% $IncidentObj->FirstCustomFieldValue('Constituency') %>" />
<& /RTIR/Elements/ShowRTIRField, Ticket => $IncidentObj, Name => 'Constituency' &>
% }
</td>
@@ -256,7 +256,7 @@
my $ip_default = $ARGS{'IP-Value'};
if ( !$ip_default && $IncidentObj ) {
$ip_default = join "\n", grep $_, map $_->Content,
- @{ $IncidentObj->CustomFieldValues( '_RTIR_IP' )->ItemsArrayRef };
+ @{ $IncidentObj->CustomFieldValues( 'IP' )->ItemsArrayRef };
}
$ip_default ||= RT->Config->Get('_RTIR_IP_default') || '';
</%PERL>
@@ -382,9 +382,9 @@
}
elsif ( $ARGS{'Create'}
&& RT->Config->Get('_RTIR_Constituency_Propagation') eq 'reject'
- && lc $ARGS{$ARGS{'Constituency'}} ne lc $IncidentObj->FirstCustomFieldValue('_RTIR_Constituency') )
+ && lc $ARGS{$ARGS{'Constituency'}} ne lc $IncidentObj->FirstCustomFieldValue('Constituency') )
{
- push @results, loc('Incident #[_1] has constituency [_2], choose the same value for a new ticket or use another Incident', $Incident, $IncidentObj->FirstCustomFieldValue('_RTIR_Constituency') );
+ push @results, loc('Incident #[_1] has constituency [_2], choose the same value for a new ticket or use another Incident', $Incident, $IncidentObj->FirstCustomFieldValue('Constituency') );
($checks_failure, $IncidentObj, $Incident) = (1, undef, undef);
}
else {
Modified: rtir/2.5/trunk/html/RTIR/Display.html
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Display.html (original)
+++ rtir/2.5/trunk/html/RTIR/Display.html Mon Apr 20 12:37:43 2009
@@ -141,7 +141,7 @@
}
($Ticket, @results) = CreateTicket( %ARGS, Attachments => delete $session{'Attachments'} );
} elsif( $id ) {
- my $oldstate = $Ticket->FirstCustomFieldValue('_RTIR_State') ||'';
+ my $oldstate = $Ticket->FirstCustomFieldValue('State') ||'';
$m->callback(
CallbackName => 'ProcessArguments',
@@ -176,7 +176,7 @@
if ( $Type eq 'Block' && ($ARGS{'Status'}||'') eq 'open' && $Ticket->Status eq 'open' ) {
my ($id, $msg) = $Ticket->AddCustomFieldValue(
- Field => '_RTIR_State',
+ Field => 'State',
Value => 'active',
);
$RT::Logger->error("Couldn't set state: $msg");
@@ -189,7 +189,7 @@
push @results, ProcessTicketDates( TicketObj => $Ticket, ARGSRef => \%ARGS );
- my $newstate = $Ticket->FirstCustomFieldValue('_RTIR_State') || '';
+ my $newstate = $Ticket->FirstCustomFieldValue('State') || '';
if ($newstate ne $oldstate) {
push (@results, loc("State changed from [_1] to [_2]", $oldstate, $newstate));
}
Modified: rtir/2.5/trunk/html/RTIR/Edit.html
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Edit.html (original)
+++ rtir/2.5/trunk/html/RTIR/Edit.html Mon Apr 20 12:37:43 2009
@@ -168,7 +168,7 @@
if ( $SaveChanges && !$OnlySearchForPeople ) {
my $checks_failure = 0;
- my $oldstate = RT::IR::Ticket::FirstCustomFieldValue( $Ticket, '_RTIR_State' );
+ my $oldstate = RT::IR::Ticket::FirstCustomFieldValue( $Ticket, 'State' );
push @results, ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS );
my $strict_acl = RT->Config->Set( StrictLinkACL => 0 );
@@ -191,7 +191,7 @@
$checks_failure = 1 unless $status;
push @results, ProcessTicketCustomFieldUpdates( ARGSRef => \%ARGS );
- my $newstate = RT::IR::Ticket::FirstCustomFieldValue( $Ticket, '_RTIR_State' );
+ my $newstate = RT::IR::Ticket::FirstCustomFieldValue( $Ticket, 'State' );
if ($newstate ne $oldstate) {
push (@results, loc("State changed from [_1] to [_2]", $oldstate, $newstate));
}
Modified: rtir/2.5/trunk/html/RTIR/Elements/AttachReports
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Elements/AttachReports (original)
+++ rtir/2.5/trunk/html/RTIR/Elements/AttachReports Mon Apr 20 12:37:43 2009
@@ -38,7 +38,7 @@
my $Format = q{
'<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',
- '__CustomField.{_RTIR_State}__/TITLE:State',
+ '__CustomField.{State}__/TITLE:State',
__LastUpdatedRelative__, __CreatedRelative__
};
</%INIT>
Modified: rtir/2.5/trunk/html/RTIR/Elements/ChildSummary
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Elements/ChildSummary (original)
+++ rtir/2.5/trunk/html/RTIR/Elements/ChildSummary Mon Apr 20 12:37:43 2009
@@ -81,7 +81,7 @@
my @conditions = ();
if ( defined $q && length $q ) {
if ( lc( $lookuptype || '' ) eq 'ip' ) {
- push @conditions, "CF.{_RTIR_IP} = '$q'";
+ push @conditions, "CF.{IP} = '$q'";
} else {
push @conditions, "Content LIKE '$q'";
}
Modified: rtir/2.5/trunk/html/RTIR/Elements/IncidentSummary
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Elements/IncidentSummary (original)
+++ rtir/2.5/trunk/html/RTIR/Elements/IncidentSummary Mon Apr 20 12:37:43 2009
@@ -91,7 +91,7 @@
my @conditions = ();
if ( defined $q && length $q ) {
if ( lc( $lookuptype || '' ) eq 'ip' ) {
- push @conditions, "CF.{_RTIR_IP} = '$q'";
+ push @conditions, "CF.{IP} = '$q'";
} else {
push @conditions, "Content LIKE '$q'";
}
Modified: rtir/2.5/trunk/html/RTIR/Elements/MergeWith
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Elements/MergeWith (original)
+++ rtir/2.5/trunk/html/RTIR/Elements/MergeWith Mon Apr 20 12:37:43 2009
@@ -21,7 +21,7 @@
my @parts;
push @parts, "id != $id";
push @parts, $m->comp('/RTIR/Elements/BaseQuery', Queue => $Queue) if $Queue;
- push @parts, "CF.{_RTIR_Constituency} = '". $Ticket->FirstCustomFieldValue('_RTIR_Constituency') ."'"
+ push @parts, "CF.{Constituency} = '". $Ticket->FirstCustomFieldValue('Constituency') ."'"
if RT->Config->Get('_RTIR_Constituency_Propagation') eq 'reject';
$BaseQuery = join ' AND ', map "( $_ )", grep $_, @parts;
}
Modified: rtir/2.5/trunk/html/RTIR/Elements/NewQuery
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Elements/NewQuery (original)
+++ rtir/2.5/trunk/html/RTIR/Elements/NewQuery Mon Apr 20 12:37:43 2009
@@ -8,7 +8,7 @@
@states = grep !$seen{$_}++, map lc, grep $_, @states, @add_states;
my $query = join " OR ",
- map "'CF.{_RTIR_State}' = '$_'",
+ map "'CF.{State}' = '$_'",
@states;
$query = "( $query )" if $query;
return $query;
Modified: rtir/2.5/trunk/html/RTIR/Elements/QueueSummary
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Elements/QueueSummary (original)
+++ rtir/2.5/trunk/html/RTIR/Elements/QueueSummary Mon Apr 20 12:37:43 2009
@@ -18,13 +18,13 @@
% for my $queue (@queues) {
% $i++;
% my $queue_cond = "Queue = '$queue'";
-% my $all_q = "$queue_cond AND (". join( ' OR ', map "CF.{_RTIR_State} = '$_'", @{ $states{ $queue } } ).')';
+% my $all_q = "$queue_cond AND (". join( ' OR ', map "CF.{State} = '$_'", @{ $states{ $queue } } ).')';
<tr class="<% $i%2 ? 'oddline' : 'evenline'%>" >
<td><a href="<% RT->Config->Get('WebPath')%>/Search/Results.html?Query=<% $all_q |un %>""><% $queue %></a></td>
% foreach my $s ( @states ) {
<td align="right">
% if ( grep $_ eq $s, @{ $states{ $queue } } ) {
-% my $query = "$queue_cond AND CF.{_RTIR_State} = '$s'";
+% my $query = "$queue_cond AND CF.{State} = '$s'";
% $Tickets->FromSQL( $query );
% my $qs = $m->comp('/Elements/QueryString', Queue => $queue, Query => $query );
<a href="<% RT->Config->Get('WebPath') %>/RTIR/Search/Results.html?<% $qs |n %>"><% $Tickets->Count %></a></td>
Modified: rtir/2.5/trunk/html/RTIR/Elements/QueueTabs
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Elements/QueueTabs (original)
+++ rtir/2.5/trunk/html/RTIR/Elements/QueueTabs Mon Apr 20 12:37:43 2009
@@ -198,7 +198,7 @@
title => loc('Quick Resolve'),
};
} elsif ( $Type eq 'Block' ) {
- if ( ($Ticket->FirstCustomFieldValue('_RTIR_State')||'') ne 'active' ) {
+ if ( ($Ticket->FirstCustomFieldValue('State')||'') ne 'active' ) {
$actions->{'Ab'} = {
path => "RTIR/Update.html?Action=Comment&DefaultStatus=open&id=$id",
title => loc('Activate')
@@ -233,7 +233,7 @@
};
}
}
- if ( $Type eq 'Block' && ($Ticket->FirstCustomFieldValue('_RTIR_State')||'') eq 'active' ) {
+ if ( $Type eq 'Block' && ($Ticket->FirstCustomFieldValue('State')||'') eq 'active' ) {
$actions->{'Ab'} = {
path => "RTIR/Update.html?Action=Respond&DefaultStatus=stalled&id=$id",
title => loc('Pending Removal'),
Modified: rtir/2.5/trunk/html/RTIR/Elements/ShowIncidents
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Elements/ShowIncidents (original)
+++ rtir/2.5/trunk/html/RTIR/Elements/ShowIncidents Mon Apr 20 12:37:43 2009
@@ -54,7 +54,7 @@
my $count = 0;
-my $query = "Queue = 'Incidents' AND HasMember = " . $Ticket->Id . " AND CF.{_RTIR_State} != 'rejected'";
+my $query = "Queue = 'Incidents' AND HasMember = " . $Ticket->Id . " AND CF.{State} != 'rejected'";
my $incidents = new RT::Tickets($session{'CurrentUser'});
$incidents->FromSQL($query);
Modified: rtir/2.5/trunk/html/RTIR/Incident/BulkAbandon.html
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Incident/BulkAbandon.html (original)
+++ rtir/2.5/trunk/html/RTIR/Incident/BulkAbandon.html Mon Apr 20 12:37:43 2009
@@ -140,11 +140,11 @@
push @tmp, $t;
foreach my $t( @tmp ) {
- my $oldstate = RT::IR::Ticket::FirstCustomFieldValue( $t, '_RTIR_State' );
+ my $oldstate = RT::IR::Ticket::FirstCustomFieldValue( $t, 'State' );
push @tempresults, ProcessTicketBasics( ARGSRef => \%ARGS, TicketObj => $t );
- my $newstate = RT::IR::Ticket::FirstCustomFieldValue( $t, '_RTIR_State' );
+ my $newstate = RT::IR::Ticket::FirstCustomFieldValue( $t, 'State' );
if ( $newstate ne $oldstate ) {
push @tempresults,
[ $t->id, loc("State changed from [_1] to [_2]", $oldstate, $newstate ) ];
Modified: rtir/2.5/trunk/html/RTIR/Incident/Create.html
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Incident/Create.html (original)
+++ rtir/2.5/trunk/html/RTIR/Incident/Create.html Mon Apr 20 12:37:43 2009
@@ -251,7 +251,7 @@
if ( $ChildObj && RT->Config->Get('_RTIR_Constituency_Propagation') eq 'reject' ) {
unless ( lc $ARGS{ $ARGS{'Constituency'} }
- eq lc $ChildObj->FirstCustomFieldValue('_RTIR_Constituency') )
+ eq lc $ChildObj->FirstCustomFieldValue('Constituency') )
{
push @results, loc( "New incident and its child #[_1] must have the same constituency", $ChildObj->id );
$checks_failure = 1;
Modified: rtir/2.5/trunk/html/RTIR/Incident/Display.html
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Incident/Display.html (original)
+++ rtir/2.5/trunk/html/RTIR/Incident/Display.html Mon Apr 20 12:37:43 2009
@@ -167,8 +167,8 @@
if ( RT->Config->Get('_RTIR_Constituency_Propagation') eq 'reject' ) {
return loc("Couldn't link tickets with different constituencies")
- unless lc $child->FirstCustomFieldValue('_RTIR_Constituency')
- eq lc $parent->FirstCustomFieldValue('_RTIR_Constituency');
+ unless lc $child->FirstCustomFieldValue('Constituency')
+ eq lc $parent->FirstCustomFieldValue('Constituency');
}
my %args = ();
@@ -230,7 +230,7 @@
$ARGS{'id'} = $id = $TicketObj->Id;
if( 1 ) {
- my $oldstate = RT::IR::Ticket::FirstCustomFieldValue( $TicketObj, '_RTIR_State' );
+ my $oldstate = RT::IR::Ticket::FirstCustomFieldValue( $TicketObj, 'State' );
if ( $ARGS{'Action'} && $ARGS{'Action'} =~ /^(Steal|Kill|Take|SetTold)$/ )
{
@@ -272,7 +272,7 @@
push @results, ProcessUpdateMessage( ARGSRef => \%ARGS, TicketObj => $TicketObj );
}
- my $newstate = RT::IR::Ticket::FirstCustomFieldValue( $TicketObj, '_RTIR_State' );
+ my $newstate = RT::IR::Ticket::FirstCustomFieldValue( $TicketObj, 'State' );
if ($newstate ne $oldstate) {
push @results, loc("State changed from [_1] to [_2]", $oldstate, $newstate );
}
Modified: rtir/2.5/trunk/html/RTIR/Incident/Edit.html
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Incident/Edit.html (original)
+++ rtir/2.5/trunk/html/RTIR/Incident/Edit.html Mon Apr 20 12:37:43 2009
@@ -140,7 +140,7 @@
my @results;
if ( $SaveChanges && !$OnlySearchForPeople ) {
my $checks_failure = 0;
- my $oldstate = $Ticket->FirstCustomFieldValue('_RTIR_State');
+ my $oldstate = $Ticket->FirstCustomFieldValue('State');
push @results, ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS);
push @results, ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS);
@@ -162,7 +162,7 @@
$ARGS{UpdateAttachments} = $session{'Attachments'};
push @results, ProcessUpdateMessage( TicketObj => $Ticket, ARGSRef=>\%ARGS );
- my $newstate = $Ticket->FirstCustomFieldValue('_RTIR_State');
+ my $newstate = $Ticket->FirstCustomFieldValue('State');
if ($newstate ne $oldstate) {
push (@results, loc("State changed from [_1] to [_2]", $oldstate, $newstate));
}
Modified: rtir/2.5/trunk/html/RTIR/Incident/Elements/Create
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Incident/Elements/Create (original)
+++ rtir/2.5/trunk/html/RTIR/Incident/Elements/Create Mon Apr 20 12:37:43 2009
@@ -41,7 +41,7 @@
<td class="value">
% if ( !$ChildObj || RT->Config->Get('_RTIR_Constituency_Propagation') eq 'no' ) {
% my $default;
-% $default = $ChildObj->FirstCustomFieldValue('_RTIR_Constituency') if $ChildObj;
+% $default = $ChildObj->FirstCustomFieldValue('Constituency') if $ChildObj;
% $default ||= RT::IR::DefaultConstituency( $QueueObj );
% $default ||= scalar RT->Config->Get('_RTIR_Constituency_default');
<& /RTIR/Elements/EditRTIRField,
@@ -53,10 +53,10 @@
% } else {
% #TODO: hacks, we need way to define CF value on Create, but don't allow user to change it
% my $cf = RT::CustomField->new( $RT::SystemUser );
-% $cf->LoadByNameAndQueue( Name => '_RTIR_Constituency', Queue => 'Incidents' );
+% $cf->LoadByNameAndQueue( Name => 'Constituency', Queue => 'Incidents' );
<input type="hidden" class="hidden" name="Constituency" value="Object-RT::Ticket--CustomField-<% $cf->id %>-Values" />
<input type="hidden" class="hidden" name="Object-RT::Ticket--CustomField-<% $cf->id %>-Values-Magic" value="1" />
-<input type="hidden" class="hidden" name="Object-RT::Ticket--CustomField-<% $cf->id %>-Values" value="<% $ChildObj->FirstCustomFieldValue('_RTIR_Constituency') %>" />
+<input type="hidden" class="hidden" name="Object-RT::Ticket--CustomField-<% $cf->id %>-Values" value="<% $ChildObj->FirstCustomFieldValue('Constituency') %>" />
<& /RTIR/Elements/ShowRTIRField, Ticket => $ChildObj, Name => 'Constituency' &>
% }
</td></tr>
@@ -91,7 +91,7 @@
my $ip_default = $ARGS{'IP-Value'};
if ( !$ip_default && $ChildObj ) {
$ip_default = join "\n", grep $_, map $_->Content,
- @{ $ChildObj->CustomFieldValues( '_RTIR_IP' )->ItemsArrayRef };
+ @{ $ChildObj->CustomFieldValues( 'IP' )->ItemsArrayRef };
}
$ip_default ||= RT->Config->Get('_RTIR_IP_default') || '';
</%PERL>
Modified: rtir/2.5/trunk/html/RTIR/Incident/Elements/ReplyForm
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Incident/Elements/ReplyForm (original)
+++ rtir/2.5/trunk/html/RTIR/Incident/Elements/ReplyForm Mon Apr 20 12:37:43 2009
@@ -23,8 +23,8 @@
QueueObj => $TicketObj->QueueObj,
Name => 'Resolution',
Default => (
- $TicketObj->FirstCustomFieldValue('_RTIR_Resolution') ||
- scalar RT->Config->Get("_RTIR_Resolution_". $Status ."_default")
+ $TicketObj->FirstCustomFieldValue('Resolution') ||
+ scalar RT->Config->Get("Resolution_". $Status ."_default")
),
Rows => 1,
&></td></tr>
Modified: rtir/2.5/trunk/html/RTIR/Incident/LinkChildren.html
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Incident/LinkChildren.html (original)
+++ rtir/2.5/trunk/html/RTIR/Incident/LinkChildren.html Mon Apr 20 12:37:43 2009
@@ -81,8 +81,8 @@
$BaseQuery = join ' AND ', map "( $_ )", $BaseQuery, "MemberOf != $id";
if ( RT->Config->Get('_RTIR_Constituency_Propagation') eq 'reject' ) {
$BaseQuery = join ' AND ', map "( $_ )",
- $BaseQuery, "CustomField.{_RTIR_Constituency} = '".
- $IncidentObj->FirstCustomFieldValue('_RTIR_Constituency') ."'"
+ $BaseQuery, "CustomField.{Constituency} = '".
+ $IncidentObj->FirstCustomFieldValue('Constituency') ."'"
}
}
Modified: rtir/2.5/trunk/html/RTIR/Incident/LinkToIncident.html
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Incident/LinkToIncident.html (original)
+++ rtir/2.5/trunk/html/RTIR/Incident/LinkToIncident.html Mon Apr 20 12:37:43 2009
@@ -88,8 +88,8 @@
$BaseQuery, "HasMember != $id";
if ( RT->Config->Get('_RTIR_Constituency_Propagation') eq 'reject' ) {
$BaseQuery = join ' AND ', map "( $_ )",
- $BaseQuery, "CustomField.{_RTIR_Constituency} = '".
- $ChildObj->FirstCustomFieldValue('_RTIR_Constituency') ."'"
+ $BaseQuery, "CustomField.{Constituency} = '".
+ $ChildObj->FirstCustomFieldValue('Constituency') ."'"
}
$Query ||= $m->comp( '/RTIR/Elements/NewQuery', Queue => $Queue );
Modified: rtir/2.5/trunk/html/RTIR/Incident/Reply.html
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Incident/Reply.html (original)
+++ rtir/2.5/trunk/html/RTIR/Incident/Reply.html Mon Apr 20 12:37:43 2009
@@ -143,7 +143,7 @@
push @queues, 'Blocks' unless RT->Config->Get('RTIR_DisableBlocksQueue');
my $ActiveStatesQuery =
- join ' OR ', map "CF.{_RTIR_State} = '$_'",
+ join ' OR ', map "CF.{State} = '$_'",
RT::IR::States( Queue => \@queues );
$Query ||= "( $ActiveStatesQuery )";
@@ -190,7 +190,7 @@
}
$id = $Ticket->id;
- my $oldstate = RT::IR::Ticket::FirstCustomFieldValue( $Ticket, '_RTIR_State' );
+ my $oldstate = RT::IR::Ticket::FirstCustomFieldValue( $Ticket, 'State' );
my @tempresults;
$ARGS{'UpdateAttachments'} = delete $session{'Attachments'};
@@ -202,7 +202,7 @@
push @results, ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS );
}
- my $newstate = RT::IR::Ticket::FirstCustomFieldValue( $Ticket, '_RTIR_State' );
+ my $newstate = RT::IR::Ticket::FirstCustomFieldValue( $Ticket, 'State' );
if ($newstate ne $oldstate) {
push (@tempresults, loc("State changed from [_1] to [_2]", $oldstate, $newstate));
@@ -225,10 +225,10 @@
}
if ( $update_incident_state ) {
- my $oldstate = RT::IR::Ticket::FirstCustomFieldValue( $IncidentObj, '_RTIR_State' );
+ my $oldstate = RT::IR::Ticket::FirstCustomFieldValue( $IncidentObj, 'State' );
push @results, ProcessObjectCustomFieldUpdates( Object => $IncidentObj, ARGSRef => \%ARGS);
push @results, ProcessTicketBasics( TicketObj => $IncidentObj, ARGSRef => \%ARGS );
- my $newstate = RT::IR::Ticket::FirstCustomFieldValue( $IncidentObj, '_RTIR_State' );
+ my $newstate = RT::IR::Ticket::FirstCustomFieldValue( $IncidentObj, 'State' );
if ($newstate ne $oldstate) {
push @results, loc("State changed from [_1] to [_2]", $oldstate, $newstate);
Modified: rtir/2.5/trunk/html/RTIR/Merge.html
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Merge.html (original)
+++ rtir/2.5/trunk/html/RTIR/Merge.html Mon Apr 20 12:37:43 2009
@@ -84,8 +84,8 @@
}
if ( $MergeTicket && RT->Config->Get('_RTIR_Constituency_Propagation') eq 'reject' ) {
- if ( lc $MergeTicket->FirstCustomFieldValue('_RTIR_Constituency')
- ne lc $Ticket->FirstCustomFieldValue('_RTIR_Constituency')
+ if ( lc $MergeTicket->FirstCustomFieldValue('Constituency')
+ ne lc $Ticket->FirstCustomFieldValue('Constituency')
) {
push @results, loc("Merge failed: Tickets have different constituencies" );
$checks_failure = 1;
@@ -133,7 +133,7 @@
my @parts;
push @parts, "id != $id";
push @parts, $m->comp('/RTIR/Elements/BaseQuery', Queue => $Queue);
- push @parts, "CF.{_RTIR_Constituency} = '". $Ticket->FirstCustomFieldValue('_RTIR_Constituency') ."'"
+ push @parts, "CF.{Constituency} = '". $Ticket->FirstCustomFieldValue('Constituency') ."'"
if RT->Config->Get('_RTIR_Constituency_Propagation') eq 'reject';
$BaseQuery = join ' AND ', map "( $_ )", grep $_, @parts;
}
Modified: rtir/2.5/trunk/html/RTIR/Report/BulkReject.html
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Report/BulkReject.html (original)
+++ rtir/2.5/trunk/html/RTIR/Report/BulkReject.html Mon Apr 20 12:37:43 2009
@@ -105,14 +105,14 @@
}
# warn if this IR has any incidents
- my $query = "Queue = 'Incidents' AND HasMember = " . $t->Id . " AND CF.{_RTIR_State} != 'rejected'";
+ my $query = "Queue = 'Incidents' AND HasMember = " . $t->Id . " AND CF.{State} != 'rejected'";
my $incidents = new RT::Tickets($session{'CurrentUser'});
$incidents->FromSQL($query);
if ($incidents->Count > 0) {
push( @tempresults, [ $id, loc("Warning: already has incident") ] );
}
- my $oldstate = RT::IR::Ticket::FirstCustomFieldValue( $t, '_RTIR_State' ) ||'';
+ my $oldstate = RT::IR::Ticket::FirstCustomFieldValue( $t, 'State' ) ||'';
if ( $t->Owner != $session{'CurrentUser'}->id &&
$t->Owner == $RT::Nobody->id )
@@ -127,7 +127,7 @@
push @tempresults, ProcessTicketBasics( ARGSRef => \%ARGS, TicketObj => $t );
- my $newstate = RT::IR::Ticket::FirstCustomFieldValue( $t, '_RTIR_State' ) ||'';
+ my $newstate = RT::IR::Ticket::FirstCustomFieldValue( $t, 'State' ) ||'';
if ( $newstate ne $oldstate ) {
push @tempresults,
[ $id, loc("State changed from [_1] to [_2]", $oldstate, $newstate ) ];
Modified: rtir/2.5/trunk/html/RTIR/Reporting/Report.html
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Reporting/Report.html (original)
+++ rtir/2.5/trunk/html/RTIR/Reporting/Report.html Mon Apr 20 12:37:43 2009
@@ -54,13 +54,13 @@
$filter_by_incident_field->(
$filter_by_incident_field->(
$tix_created,
- '_RTIR_Constituency',
+ 'Constituency',
$Constituency
),
- '_RTIR_Function',
+ 'Function',
$incident_type,
),
- '_RTIR_Classification',
+ 'Classification',
$class ne 'Unclassified'? $class: '',
);
push @table, [ $class, scalar keys %{$filtered} ];
@@ -76,25 +76,25 @@
$class_tix->FromSQL(
"Queue = 'Incident Reports'"
." AND Created > '$start' AND Created < '$end'"
- ." AND CustomField.{_RTIR_SLA} = '$service_level'"
+ ." AND CustomField.{SLA} = '$service_level'"
);
my $mytix = $filter_by_incident_field->(
$filter_by_incident_field->(
$class_tix,
- '_RTIR_Constituency',
+ 'Constituency',
$Constituency
),
- '_RTIR_Function',
+ 'Function',
$incident_type,
);
my $myoutstanding = $filter_by_incident_field->(
$filter_by_incident_field->(
$outstanding,
- '_RTIR_Constituency',
+ 'Constituency',
$Constituency
),
- '_RTIR_Function',
+ 'Function',
$incident_type,
);
$m->comp("SELF:Heading$ReportAs",
@@ -162,7 +162,7 @@
my @functions;
{
my $cf = RT::CustomField->new( $session{'CurrentUser'} );
- $cf->LoadByNameAndQueue( Queue => 'Incidents', Name => '_RTIR_Function' );
+ $cf->LoadByNameAndQueue( Queue => 'Incidents', Name => 'Function' );
my $values = $cf->Values;
while ( my $value = $values->Next ) {
push @functions, $value->Name;
@@ -173,7 +173,7 @@
my @classifications;
{
my $cf = RT::CustomField->new( $session{'CurrentUser'} );
- $cf->LoadByNameAndQueue( Queue => 'Incidents', Name => '_RTIR_Classification' );
+ $cf->LoadByNameAndQueue( Queue => 'Incidents', Name => 'Classification' );
my $values = $cf->Values;
while ( my $value = $values->Next ) {
push @classifications, $value->Name;
@@ -185,7 +185,7 @@
my @sla_levels;
{
my $cf = RT::CustomField->new( $session{'CurrentUser'} );
- $cf->LoadByNameAndQueue( Queue => 'Incidents', Name => '_RTIR_SLA' );
+ $cf->LoadByNameAndQueue( Queue => 'Incidents', Name => 'SLA' );
my $values = $cf->Values;
while ( my $value = $values->Next ) {
push @sla_levels, $value->Name;
@@ -195,12 +195,12 @@
# of new reports outstanding at start of the period
my $outstanding = RT::Tickets->new( $session{'CurrentUser'} );
$outstanding->FromSQL("Queue = 'Incident Reports' AND Created < '$start' AND (Resolved = '1970-01-01 00:00:01' OR Resolved > '$start')");
-my $outstanding_pruned = $filter_by_incident_field->($outstanding, '_RTIR_Constituency', $Constituency);
+my $outstanding_pruned = $filter_by_incident_field->($outstanding, 'Constituency', $Constituency);
# of new reports created during the period
my $tix_created = RT::Tickets->new( $session{'CurrentUser'} );
$tix_created->FromSQL("Queue = 'Incident Reports' AND Created > '$start' AND Created < '$end'");
-my $tix_created_pruned = $filter_by_incident_field->( $tix_created, '_RTIR_Constituency', $Constituency );
+my $tix_created_pruned = $filter_by_incident_field->( $tix_created, 'Constituency', $Constituency );
# of new reports resolved/closed/deleted during the period
# this means "number of reports created during the period that were
@@ -208,7 +208,7 @@
my $tix_resolved = RT::Tickets->new( $session{'CurrentUser'} );
$tix_resolved->FromSQL("Queue = 'Incident Reports' AND Created > '$start' AND Created < '$end' AND (Resolved > '1970-01-01 00:00:01' AND Resolved < '$end')");
-my $tix_resolved_pruned = $filter_by_incident_field->($tix_resolved, '_RTIR_Constituency', $Constituency);
+my $tix_resolved_pruned = $filter_by_incident_field->($tix_resolved, 'Constituency', $Constituency);
# of new reports oustanding at end of the period
# this is "number of reports created during the period that were also
@@ -216,7 +216,7 @@
my $tix_unresolved = RT::Tickets->new( $session{'CurrentUser'} );
$tix_unresolved->FromSQL("Queue = 'Incident Reports' AND Created > '$start' AND Created < '$end' AND ( Resolved = '1970-01-01 00:00:01' OR Resolved > '$end' )");
-my $tix_unresolved_pruned = $filter_by_incident_field->($tix_unresolved, '_RTIR_Constituency', $Constituency);
+my $tix_unresolved_pruned = $filter_by_incident_field->($tix_unresolved, 'Constituency', $Constituency);
if ( $TextReport ) {
$r->content_type('text/plain');
Modified: rtir/2.5/trunk/html/RTIR/Tools/Lookup.html
==============================================================================
--- rtir/2.5/trunk/html/RTIR/Tools/Lookup.html (original)
+++ rtir/2.5/trunk/html/RTIR/Tools/Lookup.html Mon Apr 20 12:37:43 2009
@@ -248,7 +248,7 @@
my $query;
if ( $type eq 'ip' ) {
- $query = "CF.{_RTIR_IP} = '$q'"
+ $query = "CF.{IP} = '$q'"
} else {
$query = "( ContentType = 'text/plain' "
. "OR ContentType = 'text' "
Modified: rtir/2.5/trunk/lib/RT/Action/RTIR_FindIP.pm
==============================================================================
--- rtir/2.5/trunk/lib/RT/Action/RTIR_FindIP.pm (original)
+++ rtir/2.5/trunk/lib/RT/Action/RTIR_FindIP.pm Mon Apr 20 12:37:43 2009
@@ -27,7 +27,7 @@
my $self = shift;
my $ticket = $self->TicketObj;
- my $cf = $ticket->LoadCustomFieldByIdentifier('_RTIR_IP');
+ my $cf = $ticket->LoadCustomFieldByIdentifier('IP');
return 1 unless $cf && $cf->id;
my $attach = $self->TransactionObj->ContentObj;
Modified: rtir/2.5/trunk/lib/RT/Action/RTIR_MergeIPs.pm
==============================================================================
--- rtir/2.5/trunk/lib/RT/Action/RTIR_MergeIPs.pm (original)
+++ rtir/2.5/trunk/lib/RT/Action/RTIR_MergeIPs.pm Mon Apr 20 12:37:43 2009
@@ -35,18 +35,18 @@
my $target = $uri_obj->Object;
return 1 if $target->id eq $txn->ObjectId;
- my $has_values = $target->CustomFieldValues( '_RTIR_IP' );
+ my $has_values = $target->CustomFieldValues( 'IP' );
my $source = RT::Ticket->new( $self->CurrentUser );
$source->LoadById( $txn->ObjectId );
- my $add_values = $source->CustomFieldValues( '_RTIR_IP' );
+ my $add_values = $source->CustomFieldValues( 'IP' );
while ( my $value = $add_values->Next ) {
my $ip = $value->Content;
next if $has_values->HasEntry( $ip );
my ($status, $msg) = $target->AddCustomFieldValue(
Value => $ip,
- Field => '_RTIR_IP',
+ Field => 'IP',
);
$RT::Logger->error("Couldn't add IP address: $msg")
unless $status;
Modified: rtir/2.5/trunk/lib/RT/Action/RTIR_SetBlockState.pm
==============================================================================
--- rtir/2.5/trunk/lib/RT/Action/RTIR_SetBlockState.pm (original)
+++ rtir/2.5/trunk/lib/RT/Action/RTIR_SetBlockState.pm Mon Apr 20 12:37:43 2009
@@ -67,7 +67,7 @@
my $t = $self->TicketObj;
my $txn = $self->TransactionObj;
my $status = $t->Status;
- my $old_state = $t->FirstCustomFieldValue('_RTIR_State');
+ my $old_state = $t->FirstCustomFieldValue('State');
if ( $status eq 'new' && $txn->Type eq 'Correspond' && $txn->IsInbound && $old_state eq 'pending activation' ) {
if ( my $re = RT->Config->Get('RTIR_BlockAproveActionRegexp') ) {
Modified: rtir/2.5/trunk/lib/RT/Action/RTIR_SetConstituency.pm
==============================================================================
--- rtir/2.5/trunk/lib/RT/Action/RTIR_SetConstituency.pm (original)
+++ rtir/2.5/trunk/lib/RT/Action/RTIR_SetConstituency.pm Mon Apr 20 12:37:43 2009
@@ -51,11 +51,11 @@
." OR Queue = 'Blocks'"
.")";
- my $constituency = $ticket->FirstCustomFieldValue('_RTIR_Constituency');
+ my $constituency = $ticket->FirstCustomFieldValue('Constituency');
if ( $constituency ) {
- $query .= " AND CF.{_RTIR_Constituency} != '$constituency'";
+ $query .= " AND CF.{Constituency} != '$constituency'";
} else {
- $query .= " AND CF.{_RTIR_Constituency} IS NOT NULL";
+ $query .= " AND CF.{Constituency} IS NOT NULL";
}
my $type = $self->TransactionObj->Type;
@@ -67,7 +67,7 @@
if ( my $parent = $tickets->First ) {
$RT::Logger->debug( "Ticket #". $ticket->id ." inherits constituency from ticket #". $parent->id );
my ($res, $msg) = $ticket->AddCustomFieldValue(
- Field => '_RTIR_Constituency',
+ Field => 'Constituency',
Value => $constituency,
);
$RT::Logger->warning( "Couldn't set CF: $msg" ) unless $res;
@@ -82,7 +82,7 @@
while ( my $t = $tickets->Next ) {
$RT::Logger->debug( "Ticket #". $t->id ." inherits constituency from ticket #". $ticket->id );
my ($res, $msg) = $t->AddCustomFieldValue(
- Field => '_RTIR_Constituency',
+ Field => 'Constituency',
Value => $constituency,
);
$RT::Logger->warning( "Couldn't set CF: $msg" ) unless $res;
@@ -96,7 +96,7 @@
my $ticket = $self->TicketObj;
my ($current, $value);
- $current = $value = $ticket->FirstCustomFieldValue('_RTIR_Constituency');
+ $current = $value = $ticket->FirstCustomFieldValue('Constituency');
if ( my $tmp = $self->GetConstituencyFromParent ) {
my $propagation = lc RT->Config->Get('_RTIR_Constituency_Propagation');
if ( $propagation eq 'inherit' ) {
@@ -114,7 +114,7 @@
return undef if ($current||'') eq ($value||'');
my ($status, $msg) = $ticket->AddCustomFieldValue(
- Field => '_RTIR_Constituency',
+ Field => 'Constituency',
Value => $value,
);
$RT::Logger->warning( "Couldn't set CF: $msg" ) unless $status;
@@ -147,7 +147,7 @@
$parents->OrderByCols( { FIELD => 'LastUpdated', ORDER => 'DESC' } );
$parents->RowsPerPage(1);
return unless my $parent = $parents->First;
- my $value = $parent->FirstCustomFieldValue('_RTIR_Constituency');
+ my $value = $parent->FirstCustomFieldValue('Constituency');
$RT::Logger->debug( "Got constituency from parent: ". ($value||'(no value)') );
return $value;
}
@@ -159,7 +159,7 @@
my $value = shift or return 0;
unless ( keys %constituency ) {
my $cf = RT::CustomField->new( $RT::SystemUser );
- $cf->Load('_RTIR_Constituency');
+ $cf->Load('Constituency');
unless ( $cf->id ) {
$RT::Logger->crit("Couldn't load constituency field");
return 0;
Modified: rtir/2.5/trunk/lib/RT/Action/RTIR_SetConstituencyGroup.pm
==============================================================================
--- rtir/2.5/trunk/lib/RT/Action/RTIR_SetConstituencyGroup.pm (original)
+++ rtir/2.5/trunk/lib/RT/Action/RTIR_SetConstituencyGroup.pm Mon Apr 20 12:37:43 2009
@@ -32,7 +32,7 @@
$groups->LimitToUserDefinedGroups;
$groups->Limit( FIELD => 'Name', OPERATOR => 'STARTSWITH', VALUE => 'DutyTeam ' );
- my $constituency = $ticket->FirstCustomFieldValue('_RTIR_Constituency') || '';
+ my $constituency = $ticket->FirstCustomFieldValue('Constituency') || '';
my $required_group_there = 0;
while ( my $group = $groups->Next ) {
if ( lc $group->Name eq lc "dutyteam $constituency" ) {
@@ -70,7 +70,7 @@
my $value = shift or return 0;
unless ( @constituencies ) {
my $cf = RT::CustomField->new( $RT::SystemUser );
- $cf->Load('_RTIR_Constituency');
+ $cf->Load('Constituency');
unless ( $cf->id ) {
$RT::Logger->crit("Couldn't load constituency field");
return 0;
Modified: rtir/2.5/trunk/lib/RT/Action/RTIR_SetDueBySLA.pm
==============================================================================
--- rtir/2.5/trunk/lib/RT/Action/RTIR_SetDueBySLA.pm (original)
+++ rtir/2.5/trunk/lib/RT/Action/RTIR_SetDueBySLA.pm Mon Apr 20 12:37:43 2009
@@ -79,9 +79,9 @@
# TODO: return if it isn't an Incident Report
# now that we know the SLA, set the value of the CF
- unless ( $self->TicketObj->FirstCustomFieldValue('_RTIR_SLA') ) {
+ unless ( $self->TicketObj->FirstCustomFieldValue('SLA') ) {
my $cf = RT::CustomField->new( $self->CurrentUser );
- $cf->LoadByNameAndQueue( Queue => $self->TicketObj->Queue, Name => '_RTIR_SLA' );
+ $cf->LoadByNameAndQueue( Queue => $self->TicketObj->Queue, Name => 'SLA' );
return unless $cf->id;
my $SLAObj = RT::IR::SLAInit();
Modified: rtir/2.5/trunk/lib/RT/Action/RTIR_SetHowReported.pm
==============================================================================
--- rtir/2.5/trunk/lib/RT/Action/RTIR_SetHowReported.pm (original)
+++ rtir/2.5/trunk/lib/RT/Action/RTIR_SetHowReported.pm Mon Apr 20 12:37:43 2009
@@ -73,7 +73,7 @@
my $self = shift;
my $cf = RT::CustomField->new($self->TransactionObj->CurrentUser);
- $cf->LoadByNameAndQueue(Queue => $self->TicketObj->QueueObj->Id, Name => '_RTIR_HowReported');
+ $cf->LoadByNameAndQueue(Queue => $self->TicketObj->QueueObj->Id, Name => 'HowReported');
return unless $cf->Id;
my $Values = $self->TicketObj->CustomFieldValues( $cf->id );
Modified: rtir/2.5/trunk/lib/RT/Action/RTIR_SetIncidentResolution.pm
==============================================================================
--- rtir/2.5/trunk/lib/RT/Action/RTIR_SetIncidentResolution.pm (original)
+++ rtir/2.5/trunk/lib/RT/Action/RTIR_SetIncidentResolution.pm Mon Apr 20 12:37:43 2009
@@ -22,7 +22,7 @@
my $t = $self->TicketObj;
my $cf = RT::CustomField->new( $self->TransactionObj->CurrentUser );
- $cf->LoadByNameAndQueue( Queue => $t->QueueObj->Id, Name => '_RTIR_Resolution' );
+ $cf->LoadByNameAndQueue( Queue => $t->QueueObj->Id, Name => 'Resolution' );
return 1 unless $cf->Id;
my $status = $t->Status;
Modified: rtir/2.5/trunk/lib/RT/Action/RTIR_SetState.pm
==============================================================================
--- rtir/2.5/trunk/lib/RT/Action/RTIR_SetState.pm (original)
+++ rtir/2.5/trunk/lib/RT/Action/RTIR_SetState.pm Mon Apr 20 12:37:43 2009
@@ -24,9 +24,9 @@
my $t = $self->TicketObj;
my $cf = RT::CustomField->new( $self->TransactionObj->CurrentUser );
- $cf->LoadByNameAndQueue( Queue => $t->QueueObj->Id, Name => '_RTIR_State' );
+ $cf->LoadByNameAndQueue( Queue => $t->QueueObj->Id, Name => 'State' );
unless ( $cf->Id ) {
- $RT::Logger->warning("Couldn't load '_RTIR_State' CF for queue ". $t->QueueObj->Name );
+ $RT::Logger->warning("Couldn't load 'State' CF for queue ". $t->QueueObj->Name );
return 1;
}
Modified: rtir/2.5/trunk/lib/RT/Condition/RTIR_BlockActivation.pm
==============================================================================
--- rtir/2.5/trunk/lib/RT/Condition/RTIR_BlockActivation.pm (original)
+++ rtir/2.5/trunk/lib/RT/Condition/RTIR_BlockActivation.pm Mon Apr 20 12:37:43 2009
@@ -20,10 +20,10 @@
my $type = $txn->Type;
return 1 if $type eq 'Create'
- && ($self->TicketObj->FirstCustomFieldValue('_RTIR_State')||'') eq 'active';
+ && ($self->TicketObj->FirstCustomFieldValue('State')||'') eq 'active';
if ( $type eq 'CustomField' ) {
- my $cf = $self->TicketObj->QueueObj->CustomField('_RTIR_State');
+ my $cf = $self->TicketObj->QueueObj->CustomField('State');
unless ( $cf->id ) {
$RT::Logger->error("Couldn't load the 'State' field");
return 0;
Modified: rtir/2.5/trunk/lib/RT/Condition/RTIR_RequireConstituencyChange.pm
==============================================================================
--- rtir/2.5/trunk/lib/RT/Condition/RTIR_RequireConstituencyChange.pm (original)
+++ rtir/2.5/trunk/lib/RT/Condition/RTIR_RequireConstituencyChange.pm Mon Apr 20 12:37:43 2009
@@ -8,7 +8,7 @@
=head2 IsApplicable
Applies to tickets being created, linked to other tickets or when
-the _RTIR_Constituency Custom Field is changed
+the Constituency Custom Field is changed
=cut
@@ -20,7 +20,7 @@
return 1 if $type eq 'AddLink';
if ( $type eq 'CustomField' ) {
my $cf = RT::CustomField->new( $RT::SystemUser );
- $cf->Load('_RTIR_Constituency');
+ $cf->Load('Constituency');
unless ( $cf->id ) {
$RT::Logger->error("Couldn't load the 'Costituency' field");
return 0;
Modified: rtir/2.5/trunk/lib/RT/Condition/RTIR_RequireConstituencyGroupChange.pm
==============================================================================
--- rtir/2.5/trunk/lib/RT/Condition/RTIR_RequireConstituencyGroupChange.pm (original)
+++ rtir/2.5/trunk/lib/RT/Condition/RTIR_RequireConstituencyGroupChange.pm Mon Apr 20 12:37:43 2009
@@ -8,7 +8,7 @@
=head2 IsApplicable
-Applies to Ticket Creation and _RTIR_Constituency changes
+Applies to Ticket Creation and Constituency changes
=cut
@@ -19,7 +19,7 @@
return 1 if $type eq 'Create';
if ( $type eq 'CustomField' ) {
my $cf = RT::CustomField->new( $RT::SystemUser );
- $cf->Load('_RTIR_Constituency');
+ $cf->Load('Constituency');
unless ( $cf->id ) {
$RT::Logger->error("Couldn't load the 'Costituency' field");
return 0;
Modified: rtir/2.5/trunk/lib/RT/IR.pm
==============================================================================
--- rtir/2.5/trunk/lib/RT/IR.pm (original)
+++ rtir/2.5/trunk/lib/RT/IR.pm Mon Apr 20 12:37:43 2009
@@ -347,7 +347,7 @@
wrap 'RT::ObjectCustomFieldValue::Create',
pre => sub {
my %args = @_[1.. at _-2];
- my $cf = GetCustomField( '_RTIR_IP' );
+ my $cf = GetCustomField( 'IP' );
unless ( $cf && $cf->id ) {
$RT::Logger->crit("Couldn't load IP CF");
return;
@@ -431,7 +431,7 @@
my $systicket = RT::Ticket->new($RT::SystemUser);
$systicket->Load( $self->id );
$const = $RT::IR::ConstituencyCache{ $self->id } =
- $systicket->FirstCustomFieldValue('_RTIR_Constituency')
+ $systicket->FirstCustomFieldValue('Constituency')
|| '_none';
}
return if $const eq '_none';
@@ -507,7 +507,7 @@
my $ticket = RT::Ticket->new($RT::SystemUser);
$ticket->Load($id);
$const = $RT::IR::ConstituencyCache{$ticket->id}
- = $ticket->FirstCustomFieldValue('_RTIR_Constituency') || '_none';
+ = $ticket->FirstCustomFieldValue('Constituency') || '_none';
}
if ($const ne '_none' && !$RT::IR::HasNoQueueCache{$const} ) {
my $new_queue = RT::Queue->new($RT::SystemUser);
@@ -536,7 +536,7 @@
my %args = (@_[1..(@_-2)]);
# get out if there is constituency value in arguments
- my $cf = GetCustomField( '_RTIR_Constituency' );
+ my $cf = GetCustomField( 'Constituency' );
return unless $cf && $cf->id;
return if $args{ 'CustomField-'. $cf->id };
@@ -595,7 +595,7 @@
return $self->SUPER::LoadByCols( %args )
unless $args{'CustomField'} && $args{'Content'};
- my $cf = RT::IR::GetCustomField( '_RTIR_IP' );
+ my $cf = RT::IR::GetCustomField( 'IP' );
unless ( $cf && $cf->id ) {
$RT::Logger->crit("Couldn't load IP CF");
return $self->SUPER::LoadByCols( %args )
Modified: rtir/2.5/trunk/lib/RT/IR/AdministrationTutorial.pod
==============================================================================
--- rtir/2.5/trunk/lib/RT/IR/AdministrationTutorial.pod (original)
+++ rtir/2.5/trunk/lib/RT/IR/AdministrationTutorial.pod Mon Apr 20 12:37:43 2009
@@ -10,62 +10,62 @@
=over 4
-=item _RTIR_State
+=item State
The various states an incident, IR, investigation, or block can be in, such as
'open', 'stalled', 'abandoned', etc.
-=item _RTIR_Constituency
+=item Constituency
The constituency of an incident, IR, investigation, or block
-=item _RTIR_Description
+=item Description
Short description of an Incident
-=item _RTIR_Resolution
+=item Resolution
How an Incident was or wasn't resolved
-=item _RTIR_SLA
+=item SLA
The SLA of an IR
-=item _RTIR_Function
+=item Function
Who is handling the Incident
-=item _RTIR_Classification
+=item Classification
The type of Incident, such as system comproise or denial of service
-=item _RTIR_HowReported
+=item HowReported
How the IR got into RTIR
-=item _RTIR_ReporterType
+=item ReporterType
Who reported the IR, such as the police or another ISP
-=item _RTIR_IP
+=item IP
IP addresses related to the incident, IR, investigation, or block
L<Tutorial/'IP'>
-=item _RTIR_Netmask
+=item Netmask
Network mask for a Block
-=item _RTIR_Port
+=item Port
Port for a Block
-=item _RTIR_WhereBlocked
+=item WhereBlocked
Where the block is placed
-=item _RTIR_Customer
+=item Customer
Customer for an IR or Investigation
@@ -167,8 +167,8 @@
=item SetDue
-In the Incident Reports queue, Due is set based on the _RTIR_SLA Custom Field
-during Ticket creation. _RTIR_SLA is set if needed, based on your Business Hours
+In the Incident Reports queue, Due is set based on the SLA Custom Field
+during Ticket creation. SLA is set if needed, based on your Business Hours
definitions.
In the Investigations and Blocks queues, Due is set to the first instant during
@@ -176,8 +176,8 @@
=item SetDueOnQueueChange
-In the Incident Reports queue, Due is set based on the _RTIR_SLA Custom Field
-during Queue Change. _RTIR_SLA is set if needed, based on your Business Hours
+In the Incident Reports queue, Due is set based on the SLA Custom Field
+during Queue Change. SLA is set if needed, based on your Business Hours
definitions.
In the Investigations and Blocks queues, Due is set to the first instant during
@@ -199,13 +199,13 @@
=item SetHowReported
Applies to the Incident Reports queue.
-On Ticket creation, set the _RTIR_HowReported Custom Field to a default
+On Ticket creation, set the HowReported Custom Field to a default
value of Email if it wasn't otherwise specified.
=item SetRTIRState
Applies to the Incident Reports, Blocks, Incidents and Investigations queues.
-Sets the _RTIR_State Custom Field based on the current Status
+Sets the State Custom Field based on the current Status
of the Ticket. This is triggered on Create, Custom Field change, Status Change,
Linking of tickets or Queue Change. Correspondence in the Blocks queue also
triggers this.
@@ -243,9 +243,9 @@
Applies to the Incident Queue.
When an Incident's Status is changed, if it is changed from an
-Inactive Status to an Active Status, the _RTIR_Resolution Custom Field
+Inactive Status to an Active Status, the Resolution Custom Field
is removed. If it is changed from an Active Status to an Inactive Status
-and the _RTIR_Resolution Custom Field wasn't set manually, it is set
+and the Resolution Custom Field wasn't set manually, it is set
to the value of _RTIR_Resolution_(rejected|resolved)_default in your
F<RTIR_Config.pm>.
@@ -259,26 +259,26 @@
=item SetIPFromContent
Applies to the Incident Reports, Blocks, Incidents and Investigations queues.
-Updates the Ticket Custom Field _RTIR_IP to have a list of all IP and IP Ranges
+Updates the Ticket Custom Field IP to have a list of all IP and IP Ranges
found in the body of the ticket during Create and Correspond
=item SetConstituency
Applies to the Incident Reports, Blocks, Incidents and Investigations queues.
Uses the Constituency algorithms discussed in L<RT::IR::Constituencies> to
-set and propagate changes to the _RTIR_Constituency Custom Field. On Ticket
+set and propagate changes to the Constituency Custom Field. On Ticket
creation, Constituency is set based on the checking the parent Ticket, the
X-RT-Mail-Extension header (see L<RT::IR::Constituencies>) or the default set
in your F<RTIR_Config.pm>
-When linking tickets or changing the _RTIR_Constituency Custom Field, this
+When linking tickets or changing the Constituency Custom Field, this
Scrip ensures that the change is propagated based on your choice of
_RTIR_Constituency_Propagation in your F<RTIR_Config.pm>
=item SetConstituencyGroup
Applies to the Incident Reports, Blocks, Incidents and Investigations queues.
-When Tickets are Created, or the _RTIR_Constituency Custom Field is updated,
+When Tickets are Created, or the Constituency Custom Field is updated,
this Scrip manages the assignment of DutyTeam groups as AdminCcs.
It makes sure that for a Constituency EDUNET, a DutyTeam group
named 'DutyTeam EDUNET' is assigned as AdminCc and removes other DutyTeam
Modified: rtir/2.5/trunk/lib/RT/IR/Constituencies.pod
==============================================================================
--- rtir/2.5/trunk/lib/RT/IR/Constituencies.pod (original)
+++ rtir/2.5/trunk/lib/RT/IR/Constituencies.pod Mon Apr 20 12:37:43 2009
@@ -47,7 +47,7 @@
Constituency is a custom field that applies to all RTIR's queues. Administrator
can manage the field and its values via the web interface: RT -> Configuration ->
-Custom Fields -> click on '_RTIR_Constituency' record in the list. At the bottom
+Custom Fields -> click on 'Constituency' record in the list. At the bottom
of the page there is control elements to add, delete and rename values of
the constituency field.
Modified: rtir/2.5/trunk/lib/RT/IR/Ticket.pm
==============================================================================
--- rtir/2.5/trunk/lib/RT/IR/Ticket.pm (original)
+++ rtir/2.5/trunk/lib/RT/IR/Ticket.pm Mon Apr 20 12:37:43 2009
@@ -12,7 +12,7 @@
=head2 FirstCustomFieldValue $TicketObj, $Field
Returns first RTIR ticket's custom field value. Use it only with RTIR's
-special custom fields like C<_RTIR_State> and other.
+special custom fields like C<State> and other.
=cut
Modified: rtir/2.5/trunk/t/013-custom-field-ip.t
==============================================================================
--- rtir/2.5/trunk/t/013-custom-field-ip.t (original)
+++ rtir/2.5/trunk/t/013-custom-field-ip.t Mon Apr 20 12:37:43 2009
@@ -15,8 +15,8 @@
diag "load and check basic properties of the IP CF" if $ENV{'TEST_VERBOSE'};
{
my $cfs = RT::CustomFields->new( $RT::SystemUser );
- $cfs->Limit( FIELD => 'Name', VALUE => '_RTIR_IP' );
- is( $cfs->Count, 1, "found one CF with name '_RTIR_IP'" );
+ $cfs->Limit( FIELD => 'Name', VALUE => 'IP' );
+ is( $cfs->Count, 1, "found one CF with name 'IP'" );
$cf = $cfs->First;
is( $cf->Type, 'Freeform', 'type check' );
@@ -63,7 +63,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok( $ticket->id, 'loaded ticket' );
- is( $ticket->FirstCustomFieldValue('_RTIR_IP'), $val, 'correct value' );
+ is( $ticket->FirstCustomFieldValue('IP'), $val, 'correct value' );
}
}
@@ -91,7 +91,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok( $ticket->id, 'loaded ticket' );
- is( $ticket->FirstCustomFieldValue('_RTIR_IP'), $val, 'correct value' );
+ is( $ticket->FirstCustomFieldValue('IP'), $val, 'correct value' );
}
}
@@ -119,7 +119,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok( $ticket->id, 'loaded ticket' );
- my $values = $ticket->CustomFieldValues('_RTIR_IP');
+ my $values = $ticket->CustomFieldValues('IP');
my %has = map { $_->Content => 1 } @{ $values->ItemsArrayRef };
ok( $has{ "172.16.$i.0-172.16.$i.1" }, "has value" )
or diag "but has values ". join ", ", keys %has;
@@ -150,7 +150,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok( $ticket->id, 'loaded ticket' );
- my $values = $ticket->CustomFieldValues('_RTIR_IP');
+ my $values = $ticket->CustomFieldValues('IP');
my %has = map { $_->Content => 1 } @{ $values->ItemsArrayRef };
ok( $has{ "172.16.$i.0-172.16.$i.1" }, "has value" )
or diag "but has values ". join ", ", keys %has;
@@ -189,7 +189,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok( $ticket->id, 'loaded ticket' );
- my $values = $ticket->CustomFieldValues('_RTIR_IP');
+ my $values = $ticket->CustomFieldValues('IP');
my %has = map { $_->Content => 1 } @{ $values->ItemsArrayRef };
is( scalar values %has, 1, "one IP were added");
ok( $has{ $val }, "has value" )
@@ -208,7 +208,7 @@
$ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok( $ticket->id, 'loaded ticket' );
- $values = $ticket->CustomFieldValues('_RTIR_IP');
+ $values = $ticket->CustomFieldValues('IP');
%has = map { $_->Content => 1 } @{ $values->ItemsArrayRef };
is( scalar values %has, 1, "one IP were added");
ok( $has{ '172.16.0.2' }, "has value" )
@@ -227,7 +227,7 @@
$ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok( $ticket->id, 'loaded ticket' );
- $values = $ticket->CustomFieldValues('_RTIR_IP');
+ $values = $ticket->CustomFieldValues('IP');
%has = map { $_->Content => 1 } @{ $values->ItemsArrayRef };
is( scalar values %has, 1, "one IP were added");
ok( $has{ $val }, "has value" )
@@ -246,7 +246,7 @@
$ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok( $ticket->id, 'loaded ticket' );
- $values = $ticket->CustomFieldValues('_RTIR_IP');
+ $values = $ticket->CustomFieldValues('IP');
%has = map { $_->Content => 1 } @{ $values->ItemsArrayRef };
is( scalar values %has, 1, "one IP were added");
ok( $has{ '172.16.0.0-172.16.255.255' }, "has value" )
@@ -264,7 +264,7 @@
is( $ticket->id, $id, 'loaded ticket' );
my %has = ();
- $has{ $_->Content }++ foreach @{ $ticket->CustomFieldValues('_RTIR_IP')->ItemsArrayRef };
+ $has{ $_->Content }++ foreach @{ $ticket->CustomFieldValues('IP')->ItemsArrayRef };
is(scalar values %has, 1, "one IP was added");
ok($has{'1.0.0.0'}, 'correct value');
@@ -276,7 +276,7 @@
is($ticket->id, $id, 'loaded ticket');
%has = ();
- $has{ $_->Content }++ foreach @{ $ticket->CustomFieldValues('_RTIR_IP')->ItemsArrayRef };
+ $has{ $_->Content }++ foreach @{ $ticket->CustomFieldValues('IP')->ItemsArrayRef };
is(scalar values %has, 1, "one IP was added");
ok($has{'255.255.255.255'}, 'correct value');
@@ -286,7 +286,7 @@
$ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
is($ticket->id, $id, 'loaded ticket');
- is($ticket->CustomFieldValues('_RTIR_IP')->Count, 0, "IP wasn't added");
+ is($ticket->CustomFieldValues('IP')->Count, 0, "IP wasn't added");
$id = create_ir( $agent, { Subject => "test ip", Content => '355.255.255.255' } );
ok($id, "created a ticket");
@@ -294,7 +294,7 @@
$ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
is($ticket->id, $id, 'loaded ticket');
- is($ticket->CustomFieldValues('_RTIR_IP')->Count, 0, "IP wasn't added");
+ is($ticket->CustomFieldValues('IP')->Count, 0, "IP wasn't added");
$id = create_ir( $agent, { Subject => "test ip", Content => '8.13.8/8.13.0/1.0' } );
ok($id, "created a ticket");
@@ -302,7 +302,7 @@
$ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
is($ticket->id, $id, 'loaded ticket');
- is($ticket->CustomFieldValues('_RTIR_IP')->Count, 0, "IP wasn't added");
+ is($ticket->CustomFieldValues('IP')->Count, 0, "IP wasn't added");
}
diag "check that IPs in messages don't add duplicates" if $ENV{'TEST_VERBOSE'};
@@ -317,7 +317,7 @@
$ticket->Load( $id );
ok( $ticket->id, 'loaded ticket' );
- my $values = $ticket->CustomFieldValues('_RTIR_IP');
+ my $values = $ticket->CustomFieldValues('IP');
my %has;
$has{ $_->Content }++ foreach @{ $values->ItemsArrayRef };
is(scalar values %has, 1, "one IP were added");
@@ -337,7 +337,7 @@
$ticket->Load( $id );
ok( $ticket->id, 'loaded ticket' );
- my $values = $ticket->CustomFieldValues('_RTIR_IP');
+ my $values = $ticket->CustomFieldValues('IP');
my %has;
$has{ $_->Content }++ foreach @{ $values->ItemsArrayRef };
is(scalar values %has, 3, "three IPs were added");
@@ -356,12 +356,12 @@
ok($id, "created first ticket");
my $tickets = RT::Tickets->new( $rtir_user );
- $tickets->FromSQL("id = $id AND CF.{_RTIR_IP} = '172.16.1.1'");
+ $tickets->FromSQL("id = $id AND CF.{IP} = '172.16.1.1'");
ok( $tickets->Count, "found tickets" );
my $flag = 1;
while ( my $ticket = $tickets->Next ) {
- my %has = map { $_->Content => 1 } @{ $ticket->CustomFieldValues('_RTIR_IP')->ItemsArrayRef };
+ my %has = map { $_->Content => 1 } @{ $ticket->CustomFieldValues('IP')->ItemsArrayRef };
next if $has{'172.16.1.0-172.16.1.1'};
$flag = 0;
ok(0, "ticket #". $ticket->id ." has no IP 172.16.1.1, but should")
@@ -380,12 +380,12 @@
ok($id, "created first ticket");
my $tickets = RT::Tickets->new( $rtir_user );
- $tickets->FromSQL("id = $id AND CF.{_RTIR_IP} = '172.16.2.0-172.16.2.255'");
+ $tickets->FromSQL("id = $id AND CF.{IP} = '172.16.2.0-172.16.2.255'");
ok( $tickets->Count, "found tickets" );
my $flag = 1;
while ( my $ticket = $tickets->Next ) {
- my %has = map { $_->Content => 1 } @{ $ticket->CustomFieldValues('_RTIR_IP')->ItemsArrayRef };
+ my %has = map { $_->Content => 1 } @{ $ticket->CustomFieldValues('IP')->ItemsArrayRef };
next if grep /^172\.16\.2\./, keys %has;
$flag = 0;
ok(0, "ticket #". $ticket->id ." has no IP from 172.16.2.0-172.16.2.255, but should");
@@ -407,68 +407,68 @@
# IP
$tickets = RT::Tickets->new( $rtir_user );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.21.10'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.21.10'");
is( $tickets->Count, 1, "found one ticket" );
- is( $tickets->First->FirstCustomFieldValue('_RTIR_IP'), '192.168.21.10', "correct value" );
+ is( $tickets->First->FirstCustomFieldValue('IP'), '192.168.21.10', "correct value" );
$tickets = RT::Tickets->new( $rtir_user );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.22.10'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.22.10'");
is( $tickets->Count, 1, "found one ticket" );
- is( $tickets->First->FirstCustomFieldValue('_RTIR_IP'), '192.168.22.10', "correct value" );
+ is( $tickets->First->FirstCustomFieldValue('IP'), '192.168.22.10', "correct value" );
# IP/32 - one address
$tickets = RT::Tickets->new( $rtir_user );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.21.10/32'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.21.10/32'");
is( $tickets->Count, 1, "found one ticket" );
- is( $tickets->First->FirstCustomFieldValue('_RTIR_IP'), '192.168.21.10', "correct value" );
+ is( $tickets->First->FirstCustomFieldValue('IP'), '192.168.21.10', "correct value" );
$tickets = RT::Tickets->new( $rtir_user );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.22.10/32'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.22.10/32'");
is( $tickets->Count, 1, "found one ticket" );
- is( $tickets->First->FirstCustomFieldValue('_RTIR_IP'), '192.168.22.10', "correct value" );
+ is( $tickets->First->FirstCustomFieldValue('IP'), '192.168.22.10', "correct value" );
# IP range
$tickets = RT::Tickets->new( $rtir_user );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.21.0-192.168.21.255'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.21.0-192.168.21.255'");
is( $tickets->Count, 1, "found one ticket" );
- is( $tickets->First->FirstCustomFieldValue('_RTIR_IP'), '192.168.21.10', "correct value" );
+ is( $tickets->First->FirstCustomFieldValue('IP'), '192.168.21.10', "correct value" );
$tickets = RT::Tickets->new( $rtir_user );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.22.0-192.168.22.255'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.22.0-192.168.22.255'");
is( $tickets->Count, 1, "found one ticket" );
- is( $tickets->First->FirstCustomFieldValue('_RTIR_IP'), '192.168.22.10', "correct value" );
+ is( $tickets->First->FirstCustomFieldValue('IP'), '192.168.22.10', "correct value" );
# IP range, with start IP greater than end
$tickets = RT::Tickets->new( $rtir_user );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.21.255-192.168.21.0'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.21.255-192.168.21.0'");
is( $tickets->Count, 1, "found one ticket" );
- is( $tickets->First->FirstCustomFieldValue('_RTIR_IP'), '192.168.21.10', "correct value" );
+ is( $tickets->First->FirstCustomFieldValue('IP'), '192.168.21.10', "correct value" );
$tickets = RT::Tickets->new( $rtir_user );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.22.255-192.168.22.0'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.22.255-192.168.22.0'");
is( $tickets->Count, 1, "found one ticket" );
- is( $tickets->First->FirstCustomFieldValue('_RTIR_IP'), '192.168.22.10', "correct value" );
+ is( $tickets->First->FirstCustomFieldValue('IP'), '192.168.22.10', "correct value" );
# CIDR/24
$tickets = RT::Tickets->new( $rtir_user );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.21.0/24'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.21.0/24'");
is( $tickets->Count, 1, "found one ticket" );
- is( $tickets->First->FirstCustomFieldValue('_RTIR_IP'), '192.168.21.10', "correct value" );
+ is( $tickets->First->FirstCustomFieldValue('IP'), '192.168.21.10', "correct value" );
$tickets = RT::Tickets->new( $rtir_user );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.22.0/24'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.22.0/24'");
is( $tickets->Count, 1, "found one ticket" );
- is( $tickets->First->FirstCustomFieldValue('_RTIR_IP'), '192.168.22.10', "correct value" );
+ is( $tickets->First->FirstCustomFieldValue('IP'), '192.168.22.10', "correct value" );
# IP is not in CIDR/24
$tickets = RT::Tickets->new( $rtir_user );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} != '192.168.21.0/24'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} != '192.168.21.0/24'");
is( $tickets->Count, 1, "found one ticket" );
- is( $tickets->First->FirstCustomFieldValue('_RTIR_IP'), '192.168.22.10', "correct value" );
+ is( $tickets->First->FirstCustomFieldValue('IP'), '192.168.22.10', "correct value" );
$tickets = RT::Tickets->new( $rtir_user );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} != '192.168.22.0/24'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} != '192.168.22.0/24'");
is( $tickets->Count, 1, "found one ticket" );
- is( $tickets->First->FirstCustomFieldValue('_RTIR_IP'), '192.168.21.10', "correct value" );
+ is( $tickets->First->FirstCustomFieldValue('IP'), '192.168.21.10', "correct value" );
# CIDR or CIDR
$tickets = RT::Tickets->new( $rtir_user );
$tickets->FromSQL("(id = $id1 OR id = $id2) AND "
- ."(CF.{_RTIR_IP} = '192.168.21.0/24' OR CF.{_RTIR_IP} = '192.168.22.0/24')");
+ ."(CF.{IP} = '192.168.21.0/24' OR CF.{IP} = '192.168.22.0/24')");
is( $tickets->Count, 2, "found both tickets" );
}
@@ -485,69 +485,69 @@
# IP
$tickets = RT::Tickets->new( $rtir_user );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.21.0'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.21.0'");
is( $tickets->Count, 1, "found one ticket" );
is( $tickets->First->id, $id1, "correct value" );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.21.64'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.21.64'");
is( $tickets->Count, 1, "found one ticket" );
is( $tickets->First->id, $id1, "correct value" );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.21.127'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.21.127'");
is( $tickets->Count, 1, "found one ticket" );
is( $tickets->First->id, $id1, "correct value" );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.21.128'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.21.128'");
is( $tickets->Count, 1, "found one ticket" );
is( $tickets->First->id, $id2, "correct value" );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.21.191'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.21.191'");
is( $tickets->Count, 1, "found one ticket" );
is( $tickets->First->id, $id2, "correct value" );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.21.255'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.21.255'");
is( $tickets->Count, 1, "found one ticket" );
is( $tickets->First->id, $id2, "correct value" );
# IP/32 - one address
$tickets = RT::Tickets->new( $rtir_user );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.21.63/32'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.21.63/32'");
is( $tickets->Count, 1, "found one ticket" );
is( $tickets->First->id, $id1, "correct value" );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.21.191/32'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.21.191/32'");
is( $tickets->Count, 1, "found one ticket" );
is( $tickets->First->id, $id2, "correct value" );
# IP range, lower than both
$tickets = RT::Tickets->new( $rtir_user );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.20.0-192.168.20.255'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.20.0-192.168.20.255'");
is( $tickets->Count, 0, "didn't finnd ticket" ) or diag "but found ". $tickets->First->id;
# IP range, intersect with the first range
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.20.0-192.168.21.63'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.20.0-192.168.21.63'");
is( $tickets->Count, 1, "found one ticket" );
is( $tickets->First->id, $id1, "correct value" );
# IP range, equal to the first range
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.21.0-192.168.21.127'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.21.0-192.168.21.127'");
is( $tickets->Count, 1, "found one ticket" );
is( $tickets->First->id, $id1, "correct value" );
# IP range, lay inside the first range
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.21.31-192.168.21.63'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.21.31-192.168.21.63'");
is( $tickets->Count, 1, "found one ticket" );
is( $tickets->First->id, $id1, "correct value" );
# IP range, intersect with the ranges
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.21.31-192.168.21.191'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.21.31-192.168.21.191'");
is( $tickets->Count, 2, "found both tickets" );
# IP range, equal to range from the starting IP of the first ticket to the ending IP of the second
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.21.0-192.168.21.255'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.21.0-192.168.21.255'");
is( $tickets->Count, 2, "found both tickets" );
# IP range, has the both ranges inside it
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168/16'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168/16'");
is( $tickets->Count, 2, "found both tickets" );
# IP range, greater than both
$tickets = RT::Tickets->new( $rtir_user );
- $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{_RTIR_IP} = '192.168.22/24'");
+ $tickets->FromSQL("(id = $id1 OR id = $id2) AND CF.{IP} = '192.168.22/24'");
is( $tickets->Count, 0, "didn't finnd ticket" ) or diag "but found ". $tickets->First->id;
}
@@ -582,7 +582,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $b1_id );
ok $ticket->id, 'loaded ticket';
- my $values = $ticket->CustomFieldValues('_RTIR_IP');
+ my $values = $ticket->CustomFieldValues('IP');
my %has = map { $_->Content => 1 } @{ $values->ItemsArrayRef };
is( scalar values %has, 2, "both IPs are there");
ok( $has{ '172.16.0.1' }, "has value" )
@@ -622,7 +622,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $b1_id );
ok $ticket->id, 'loaded ticket';
- my $values = $ticket->CustomFieldValues('_RTIR_IP');
+ my $values = $ticket->CustomFieldValues('IP');
my @has = map $_->Content, @{ $values->ItemsArrayRef };
is( scalar @has, 1, "only one IP") or diag "values: @has";
is( $has[0], '172.16.0.1', "has value" );
Modified: rtir/2.5/trunk/t/020-incident-and-investigation.t
==============================================================================
--- rtir/2.5/trunk/t/020-incident-and-investigation.t (original)
+++ rtir/2.5/trunk/t/020-incident-and-investigation.t Mon Apr 20 12:37:43 2009
@@ -46,13 +46,13 @@
my $inc = RT::Ticket->new( $RT::SystemUser );
$inc->Load( $inc_id );
ok $inc->id, 'loaded incident';
- is $inc->FirstCustomFieldValue('_RTIR_Classification'), 'Spam', 'CF value is in place';
- is $inc->FirstCustomFieldValue('_RTIR_IP'), '172.16.0.1', 'CF value is in place';
+ is $inc->FirstCustomFieldValue('Classification'), 'Spam', 'CF value is in place';
+ is $inc->FirstCustomFieldValue('IP'), '172.16.0.1', 'CF value is in place';
my $inv = RT::Ticket->new( $RT::SystemUser );
$inv->Load( $inv_id );
ok $inv->id, 'loaded investigation';
- is $inv->FirstCustomFieldValue('_RTIR_Classification'), undef, 'no classification CF for Invs';
- is $inv->FirstCustomFieldValue('_RTIR_IP'), '172.16.0.1', 'IP is here';
+ is $inv->FirstCustomFieldValue('Classification'), undef, 'no classification CF for Invs';
+ is $inv->FirstCustomFieldValue('IP'), '172.16.0.1', 'IP is here';
}
Modified: rtir/2.5/trunk/t/constituency/acl.t
==============================================================================
--- rtir/2.5/trunk/t/constituency/acl.t (original)
+++ rtir/2.5/trunk/t/constituency/acl.t Mon Apr 20 12:37:43 2009
@@ -12,10 +12,10 @@
diag "load and check basic properties of the CF" if $ENV{'TEST_VERBOSE'};
{
my $cfs = RT::CustomFields->new( $RT::SystemUser );
- $cfs->Limit( FIELD => 'Name', VALUE => '_RTIR_Constituency' );
+ $cfs->Limit( FIELD => 'Name', VALUE => 'Constituency' );
$cf = $cfs->First;
ok $cf && $cf->id, 'loaded field';
- is $cf->Name, '_RTIR_Constituency', 'good name';
+ is $cf->Name, 'Constituency', 'good name';
}
my $user = RT::Test->load_or_create_user(
Modified: rtir/2.5/trunk/t/constituency/basics.t
==============================================================================
--- rtir/2.5/trunk/t/constituency/basics.t (original)
+++ rtir/2.5/trunk/t/constituency/basics.t Mon Apr 20 12:37:43 2009
@@ -18,8 +18,8 @@
diag "load and check basic properties of the CF" if $ENV{'TEST_VERBOSE'};
{
my $cfs = RT::CustomFields->new( $RT::SystemUser );
- $cfs->Limit( FIELD => 'Name', VALUE => '_RTIR_Constituency' );
- is( $cfs->Count, 1, "found one CF with name '_RTIR_Constituency'" );
+ $cfs->Limit( FIELD => 'Name', VALUE => 'Constituency' );
+ is( $cfs->Count, 1, "found one CF with name 'Constituency'" );
$cf = $cfs->First;
is( $cf->Type, 'Select', 'type check' );
@@ -89,7 +89,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok( $ticket->id, 'loaded ticket' );
- is( $ticket->FirstCustomFieldValue('_RTIR_Constituency'), $val, 'correct value' );
+ is( $ticket->FirstCustomFieldValue('Constituency'), $val, 'correct value' );
diag "check that we can edit value" if $ENV{'TEST_VERBOSE'};
$agent->follow_link( text => 'Edit' );
@@ -107,7 +107,7 @@
$ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok( $ticket->id, 'loaded ticket' );
- is( lc $ticket->FirstCustomFieldValue('_RTIR_Constituency'), lc $val, 'correct value' );
+ is( lc $ticket->FirstCustomFieldValue('Constituency'), lc $val, 'correct value' );
}
}
@@ -252,7 +252,7 @@
);
my $ticket = RT::Ticket->new($RT::SystemUser);
$ticket->Load($ir_id);
- is( $ticket->FirstCustomFieldValue('_RTIR_Constituency'), 'EDUNET', 'correct value' );
+ is( $ticket->FirstCustomFieldValue('Constituency'), 'EDUNET', 'correct value' );
}
diag "check defaults";
@@ -263,7 +263,7 @@
);
my $ticket = RT::Ticket->new($RT::SystemUser);
$ticket->Load($ir_id);
- is( $ticket->FirstCustomFieldValue('_RTIR_Constituency'), 'GOVNET', 'correct value' );
+ is( $ticket->FirstCustomFieldValue('Constituency'), 'GOVNET', 'correct value' );
}
diag "check defaults when creating inc with inv";
@@ -280,11 +280,11 @@
{
my $ticket = RT::Ticket->new($RT::SystemUser);
$ticket->Load($inc_id);
- is( $ticket->FirstCustomFieldValue('_RTIR_Constituency'), 'GOVNET', 'correct value' );
+ is( $ticket->FirstCustomFieldValue('Constituency'), 'GOVNET', 'correct value' );
} {
my $ticket = RT::Ticket->new($RT::SystemUser);
$ticket->Load($inv_id);
- is( $ticket->FirstCustomFieldValue('_RTIR_Constituency'), 'GOVNET', 'correct value' );
+ is( $ticket->FirstCustomFieldValue('Constituency'), 'GOVNET', 'correct value' );
}
}
@@ -302,11 +302,11 @@
{
my $ticket = RT::Ticket->new($RT::SystemUser);
$ticket->Load($inc_id);
- is( $ticket->FirstCustomFieldValue('_RTIR_Constituency'), 'EDUNET', 'correct value' );
+ is( $ticket->FirstCustomFieldValue('Constituency'), 'EDUNET', 'correct value' );
} {
my $ticket = RT::Ticket->new($RT::SystemUser);
$ticket->Load($inv_id);
- is( $ticket->FirstCustomFieldValue('_RTIR_Constituency'), 'EDUNET', 'correct value' );
+ is( $ticket->FirstCustomFieldValue('Constituency'), 'EDUNET', 'correct value' );
}
}
Modified: rtir/2.5/trunk/t/constituency/email.t
==============================================================================
--- rtir/2.5/trunk/t/constituency/email.t (original)
+++ rtir/2.5/trunk/t/constituency/email.t Mon Apr 20 12:37:43 2009
@@ -15,7 +15,7 @@
diag "load the field" if $ENV{'TEST_VERBOSE'};
{
my $cfs = RT::CustomFields->new( $RT::SystemUser );
- $cfs->Limit( FIELD => 'Name', VALUE => '_RTIR_Constituency' );
+ $cfs->Limit( FIELD => 'Name', VALUE => 'Constituency' );
$cf = $cfs->First;
ok $cf, 'have a field';
ok $cf->id, 'with some ID';
@@ -53,7 +53,7 @@
$ticket->Load( $id );
ok $ticket->id, 'loaded ticket';
is $ticket->QueueObj->Name, $queue, 'correct queue';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'), $val, 'correct value';
+ is $ticket->FirstCustomFieldValue('Constituency'), $val, 'correct value';
}
}
@@ -89,7 +89,7 @@
$ticket->Load( $id );
ok( $ticket->id, 'loaded ticket' );
is( $ticket->QueueObj->Name, $queue, 'correct queue' );
- is( $ticket->FirstCustomFieldValue('_RTIR_Constituency'), $val, 'correct value' );
+ is( $ticket->FirstCustomFieldValue('Constituency'), $val, 'correct value' );
}
}
Modified: rtir/2.5/trunk/t/constituency/email_outgoing.t
==============================================================================
--- rtir/2.5/trunk/t/constituency/email_outgoing.t (original)
+++ rtir/2.5/trunk/t/constituency/email_outgoing.t Mon Apr 20 12:37:43 2009
@@ -75,7 +75,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok $ticket->id, 'loaded the ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'), 'EDUNET', 'correct value';
+ is $ticket->FirstCustomFieldValue('Constituency'), 'EDUNET', 'correct value';
display_ticket($agent, $id);
$agent->content_like( qr/\QEDUNET/, "value on the page" );
@@ -111,7 +111,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok $ticket->id, 'loaded the ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'), 'GOVNET', 'correct value';
+ is $ticket->FirstCustomFieldValue('Constituency'), 'GOVNET', 'correct value';
display_ticket($agent, $id);
$agent->content_like( qr/GOVNET/, "value on the page" );
@@ -144,7 +144,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok $ticket->id, 'loaded the ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'), 'EDUNET', 'correct value';
+ is $ticket->FirstCustomFieldValue('Constituency'), 'EDUNET', 'correct value';
my @mail = RT::Test->fetch_caught_mails;
ok @mail, 'there are some outgoing emails';
Modified: rtir/2.5/trunk/t/constituency/propagation-inherit.t
==============================================================================
--- rtir/2.5/trunk/t/constituency/propagation-inherit.t (original)
+++ rtir/2.5/trunk/t/constituency/propagation-inherit.t Mon Apr 20 12:37:43 2009
@@ -13,7 +13,7 @@
diag "load the field" if $ENV{'TEST_VERBOSE'};
{
my $cfs = RT::CustomFields->new( $RT::SystemUser );
- $cfs->Limit( FIELD => 'Name', VALUE => '_RTIR_Constituency' );
+ $cfs->Limit( FIELD => 'Name', VALUE => 'Constituency' );
$cf = $cfs->First;
ok $cf, 'have a field';
ok $cf->id, 'with some ID';
@@ -40,7 +40,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $inc_id );
ok $ticket->id, 'loaded ticket';
- is uc $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is uc $ticket->FirstCustomFieldValue('Constituency'),
'GOVNET', 'correct value';
}
@@ -58,7 +58,7 @@
$ticket->Load( $ir_id );
ok $ticket->id, 'loaded ticket';
is $ticket->QueueObj->Name, 'Incident Reports', 'correct value';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'), 'GOVNET', 'correct value';
+ is $ticket->FirstCustomFieldValue('Constituency'), 'GOVNET', 'correct value';
# click [new] near 'incident', set another constituency and create
$agent->follow_link_ok({text => '[New]'}, "go to 'New Incident' page");
@@ -76,7 +76,7 @@
$ticket->Load( $inc_id );
ok $ticket->id, 'loaded ticket';
is $ticket->QueueObj->Name, 'Incidents', 'correct value';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'GOVNET', 'correct value';
# And the report too
@@ -84,7 +84,7 @@
$ticket->Load( $ir_id );
ok $ticket->id, 'loaded ticket';
is $ticket->QueueObj->Name, 'Incident Reports', 'correct value';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'GOVNET', 'correct value';
}
@@ -101,7 +101,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $incident_id );
ok $ticket->id, 'loaded ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', 'correct value';
}
@@ -124,13 +124,13 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok $ticket->id, 'loaded ticket';
- is uc $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is uc $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', 'value has been changed';
} {
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $incident_id );
ok $ticket->id, 'loaded ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', 'incident still has the same value';
}
}
@@ -161,13 +161,13 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $incident_id );
ok $ticket->id, 'loaded ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'GOVNET', 'correct value';
} {
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $child_id );
ok $ticket->id, 'loaded ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'GOVNET', 'correct value';
}
@@ -185,13 +185,13 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $child_id );
ok $ticket->id, 'loaded ticket';
- is uc $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is uc $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', 'correct value';
} {
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $incident_id );
ok $ticket->id, 'loaded ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', "incident's constituency has been changed";
}
@@ -209,13 +209,13 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $child_id );
ok $ticket->id, 'loaded ticket';
- is uc $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is uc $ticket->FirstCustomFieldValue('Constituency'),
'GOVNET', 'correct value';
} {
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $incident_id );
ok $ticket->id, 'loaded ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'GOVNET', "incident's constituency has been changed";
}
}
@@ -244,13 +244,13 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $incident_id );
ok $ticket->id, 'loaded ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', 'correct value';
} {
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $child_id );
ok $ticket->id, 'loaded ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'GOVNET', 'correct value';
}
@@ -262,13 +262,13 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $child_id );
ok $ticket->id, 'loaded ticket';
- is uc $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is uc $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', "child's constituency has been changed";
} {
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $incident_id );
ok $ticket->id, 'loaded ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', 'correct value';
}
}
Modified: rtir/2.5/trunk/t/constituency/propagation-no.t
==============================================================================
--- rtir/2.5/trunk/t/constituency/propagation-no.t (original)
+++ rtir/2.5/trunk/t/constituency/propagation-no.t Mon Apr 20 12:37:43 2009
@@ -13,7 +13,7 @@
diag "load the field" if $ENV{'TEST_VERBOSE'};
{
my $cfs = RT::CustomFields->new( $RT::SystemUser );
- $cfs->Limit( FIELD => 'Name', VALUE => '_RTIR_Constituency' );
+ $cfs->Limit( FIELD => 'Name', VALUE => 'Constituency' );
$cf = $cfs->First;
ok $cf, 'have a field';
ok $cf->id, 'with some ID';
@@ -36,7 +36,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $incident_id );
ok $ticket->id, 'loaded ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', 'correct value';
}
@@ -60,13 +60,13 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok $ticket->id, 'loaded ticket';
- is uc $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is uc $ticket->FirstCustomFieldValue('Constituency'),
'GOVNET', 'correct value';
} {
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $incident_id );
ok $ticket->id, 'loaded ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', 'incident still has the same value';
}
@@ -91,13 +91,13 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok $ticket->id, 'loaded ticket';
- is uc $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is uc $ticket->FirstCustomFieldValue('Constituency'),
'GOVNET', 'correct value';
} {
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $incident_id );
ok $ticket->id, 'loaded ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', 'incident still has the same value';
}
}
@@ -120,7 +120,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $inc_id );
ok $ticket->id, 'loaded ticket';
- is uc $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is uc $ticket->FirstCustomFieldValue('Constituency'),
'GOVNET', 'correct value';
}
@@ -140,7 +140,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $inc_id );
ok $ticket->id, 'loaded ticket';
- is uc $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is uc $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', 'correct value';
}
@@ -162,7 +162,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $inc_id );
ok $ticket->id, 'loaded ticket';
- is uc $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is uc $ticket->FirstCustomFieldValue('Constituency'),
'GOVNET', 'correct value';
}
@@ -177,13 +177,13 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $ir_id );
ok $ticket->id, 'loaded ticket';
- is uc $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is uc $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', 'correct value';
} {
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $inc_id );
ok $ticket->id, 'loaded ticket';
- is uc $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is uc $ticket->FirstCustomFieldValue('Constituency'),
'GOVNET', 'correct value';
}
}
Modified: rtir/2.5/trunk/t/constituency/propagation-reject.t
==============================================================================
--- rtir/2.5/trunk/t/constituency/propagation-reject.t (original)
+++ rtir/2.5/trunk/t/constituency/propagation-reject.t Mon Apr 20 12:37:43 2009
@@ -13,7 +13,7 @@
diag "load the field" if $ENV{'TEST_VERBOSE'};
{
my $cfs = RT::CustomFields->new( $RT::SystemUser );
- $cfs->Limit( FIELD => 'Name', VALUE => '_RTIR_Constituency' );
+ $cfs->Limit( FIELD => 'Name', VALUE => 'Constituency' );
$cf = $cfs->First;
ok $cf, 'have a field';
ok $cf->id, 'with some ID';
@@ -40,7 +40,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $inc_id );
ok $ticket->id, 'loaded ticket';
- is uc $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is uc $ticket->FirstCustomFieldValue('Constituency'),
'GOVNET', 'correct value';
}
@@ -58,7 +58,7 @@
$ticket->Load( $ir_id );
ok $ticket->id, 'loaded ticket';
is $ticket->QueueObj->Name, 'Incident Reports', 'correct value';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'), 'GOVNET', 'correct value';
+ is $ticket->FirstCustomFieldValue('Constituency'), 'GOVNET', 'correct value';
# click [new] near 'incident', set another constituency and create
$agent->follow_link_ok({text => '[New]'}, "go to 'New Incident' page");
@@ -75,7 +75,7 @@
$ticket->Load( $inc_id );
ok $ticket->id, 'loaded ticket';
is $ticket->QueueObj->Name, 'Incidents', 'correct value';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'GOVNET', 'correct value';
# And the report too
@@ -83,7 +83,7 @@
$ticket->Load( $ir_id );
ok $ticket->id, 'loaded ticket';
is $ticket->QueueObj->Name, 'Incident Reports', 'correct value';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'GOVNET', 'correct value';
}
@@ -100,7 +100,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $incident_id );
ok $ticket->id, 'loaded ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', 'correct value';
}
@@ -136,7 +136,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $incident_id );
ok $ticket->id, 'loaded ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', 'correct value';
}
@@ -159,13 +159,13 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok $ticket->id, 'loaded ticket';
- is uc $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is uc $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', 'correct value';
} {
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $incident_id );
ok $ticket->id, 'loaded ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', 'incident still has the same value';
}
ticket_is_linked_to_inc($agent, $id, $incident_id);
@@ -187,7 +187,7 @@
$ticket->Load( $ir_id );
ok $ticket->id, 'loaded ticket';
is $ticket->QueueObj->Name, 'Incident Reports', 'correct value';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'GOVNET', 'correct value';
$ticket->Subject("incident report #$ir_id");
}
@@ -203,7 +203,7 @@
$ticket->Load( $inc_id );
ok $ticket->id, 'loaded ticket';
is $ticket->QueueObj->Name, 'Incidents', 'correct value';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', 'correct value';
}
$agent->get_ok(
@@ -230,7 +230,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok $ticket->id, 'loaded ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'GOVNET', 'correct value';
}
@@ -246,7 +246,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok $ticket->id, 'loaded ticket';
- is uc $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is uc $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', 'correct value';
}
}
@@ -264,7 +264,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $incident_id );
ok $ticket->id, 'loaded ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', 'correct value';
}
@@ -282,7 +282,7 @@
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok $ticket->id, 'loaded ticket';
- is $ticket->FirstCustomFieldValue('_RTIR_Constituency'),
+ is $ticket->FirstCustomFieldValue('Constituency'),
'EDUNET', 'correct value';
}
Modified: rtir/2.5/trunk/t/rtir-test.pl
==============================================================================
--- rtir/2.5/trunk/t/rtir-test.pl (original)
+++ rtir/2.5/trunk/t/rtir-test.pl Mon Apr 20 12:37:43 2009
@@ -300,7 +300,7 @@
while($agent->content() !~ m|<a href="/Ticket/Display.html\?id=$id_to_merge_to">$id_to_merge_to</a>|) {
my @ids = sort map s|<b>\s*<a href="/Ticket/Display.html?id=(\d+)">\1</a>\s*</b>|$1|, split /<td/, $agent->content();
my $max = pop @ids;
- my $url = "Merge.html?id=$id&Order=ASC&Query=( 'CF.{_RTIR_State}' = 'new' OR 'CF.{_RTIR_State}' = 'open' AND 'id' > $max)";
+ my $url = "Merge.html?id=$id&Order=ASC&Query=( 'CF.{State}' = 'new' OR 'CF.{State}' = 'open' AND 'id' > $max)";
my $weburl = RT->Config->Get('WebURL');
diag("IDs found: " . join ', ', @ids);
diag("Max ID: " . $max);
More information about the Rt-commit
mailing list