[Rt-commit] rtir branch, 4.0.0-releng, created. 3.3.0-179-g1ec9e40
Shawn Moore
shawn at bestpractical.com
Thu May 26 18:10:54 EDT 2016
The branch, 4.0.0-releng has been created
at 1ec9e40381d972e97508aeaa0ba5ff51eb4ed89d (commit)
- Log -----------------------------------------------------------------
commit 85afa57f4c80f699002797b13eb391860ac8f23e
Author: Dustin Graves <dustin at bestpractical.com>
Date: Thu May 26 18:08:01 2016 +0000
clean up remaining traces of Blocks after Blocks->Countermeasures change
diff --git a/docs/AdministrationTutorial.pod b/docs/AdministrationTutorial.pod
index 8e54bb0..6466618 100644
--- a/docs/AdministrationTutorial.pod
+++ b/docs/AdministrationTutorial.pod
@@ -45,20 +45,20 @@ of L</Scrips> below.
=head2 Custom Queues
-While RTIR ships with four queues by default--Incident Reports, Incidents,
-Investigations, and Blocks--you can create your own versions of these queues.
-This functionality (new in RTIR 3.4) is what powers the L<Constituencies>
-feature, but its use is not limited to Constituencies. For example you can have
-multiple queues for Incident Reports, one for each of your monitoring tools,
-each with its own set of custom fields, watchers, automation with scrips,
-templates, watchers, etc.
+While RTIR ships with four queues by default (Incident Reports, Incidents,
+Investigations, and Countermeasures) you can create your own versions of these
+queues. This functionality (new in RTIR 3.4) is what powers the
+L<Constituencies> feature, but its use is not limited to Constituencies. For
+example you can have multiple queues for Incident Reports, one for each of your
+monitoring tools, each with its own set of custom fields, watchers, automation
+with scrips, templates, watchers, etc.
To create a new RTIR queue, visit RT's Admin -> Queue -> Create menu. Create
the queue as normal, but be sure to select an RTIR lifecycle (incident_reports,
-incidents, investigations, or blocks). By doing so you include the queue into
-the RTIR system. After creating the queue, it will be available throughout RTIR
-alongside the four builtin incident response queues. Assign custom fields,
-watchers, etc. as desired.
+incidents, investigations, or countermeasures). By doing so you include the
+queue into the RTIR system. After creating the queue, it will be available
+throughout RTIR alongside the four builtin incident response queues. Assign
+custom fields, watchers, etc. as desired.
=head2 Custom Fields
diff --git a/etc/RTIR_Config.pm b/etc/RTIR_Config.pm
index cc15f94..dfeb340 100644
--- a/etc/RTIR_Config.pm
+++ b/etc/RTIR_Config.pm
@@ -609,7 +609,7 @@ Set($RTIR_DisableCountermeasures, 0);
=item C<$RTIR_CountermeasureApproveActionRegexp>
-When requestor replies on the block in pending state RTIR
+When requestor replies on the countermeasure in pending state RTIR
changes state, you can set regular expresion so state would
be changed only when content matches the regexp.
diff --git a/etc/initialdata b/etc/initialdata
index 9538b0d..9eb62c5 100644
--- a/etc/initialdata
+++ b/etc/initialdata
@@ -379,7 +379,7 @@ die "Please add RT::IR to your Plugins configuration before initializing the dat
@Templates = (
{ Queue => 'Countermeasures',
Name => 'Autoreply',
- Description => 'Sent when a block is created',
+ Description => 'Sent when a countermeasure is created',
Content => 'RT-Attach-Message: yes
Subject: { $Ticket->Subject }
diff --git a/html/Callbacks/RTIR/Elements/MakeClicky/Default b/html/Callbacks/RTIR/Elements/MakeClicky/Default
index 24ddddb..2b08856 100644
--- a/html/Callbacks/RTIR/Elements/MakeClicky/Default
+++ b/html/Callbacks/RTIR/Elements/MakeClicky/Default
@@ -105,9 +105,9 @@ my %actions;
my $result .= qq{<a class="button" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=ip&q=".$escaped_host).qq{">}
.loc('Lookup IP') .q{</a>};
if ( $args{incident} && !RT->Config->Get('RTIR_DisableCountermeasures') ) {
- $result .= qq{<a class="button create_child_blocks" href="} .
+ $result .= qq{<a class="button create_child_} . RT::IR->lifecycle_countermeasure . qq{" href="} .
RT::IR->HREFTo("CreateInQueue.html?Incident=".$args{incident}."&Lifecycle=".RT::IR->lifecycle_countermeasure.qq{&IP-Value=$escaped_host})
- .qq{">block</a>};
+ .qq{">Block</a>};
}
if ( $args{'object'} && $args{'object'}->id ) {
my $cf = RT::IR::GetCustomField('IP');
diff --git a/html/Callbacks/RTIR/Elements/RT__Ticket/ColumnMap/Once b/html/Callbacks/RTIR/Elements/RT__Ticket/ColumnMap/Once
index 0cef225..495ce87 100644
--- a/html/Callbacks/RTIR/Elements/RT__Ticket/ColumnMap/Once
+++ b/html/Callbacks/RTIR/Elements/RT__Ticket/ColumnMap/Once
@@ -155,7 +155,7 @@ $COLUMN_MAP->{'LookupToolIncidentActions'} = {
push @res, \'<a href="',
RT::IR->HREFTo('CreateInQueue.html?Lifecycle='.RT::IR->lifecycle_investigation
.'&Incident='. $t->id),
- \'" class="create_child_blocks">',
+ \'" class="create_child_' . RT::IR->lifecycle_investigation . '">',
'[' . $t->loc("Investigate") .']',
\'</a>'
;
diff --git a/t/countermeasure/pending-no-regexp.t b/t/countermeasure/pending-no-regexp.t
index c08718d..429516c 100644
--- a/t/countermeasure/pending-no-regexp.t
+++ b/t/countermeasure/pending-no-regexp.t
@@ -10,50 +10,50 @@ RT->Config->Set('RTIR_CountermeasureApproveActionRegexp', undef);
RT::Test->started_ok;
my $agent = default_agent();
-my $inc_id = $agent->create_incident( {Subject => "incident with block"});
+my $inc_id = $agent->create_incident( {Subject => "incident with countermeasure"});
my $rtname = RT->Config->Get('rtname');
-my $block_id = $agent->create_countermeasure( {
- Subject => "block",
+my $countermeasure_id = $agent->create_countermeasure( {
+ Subject => "countermeasure",
Incident => $inc_id,
Requestors => 'rt-test at example.com',
} );
-$agent->ticket_status_is( $block_id, 'pending activation');
+$agent->ticket_status_is( $countermeasure_id, 'pending activation');
{
my $text = <<EOF;
From: rt-test\@example.com
To: rt\@@{[RT->Config->Get('rtname')]}
-Subject: [$rtname #$block_id] This is a test
+Subject: [$rtname #$countermeasure_id] This is a test
test
EOF
my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Countermeasures');
is $status >> 8, 0, "The mail gateway exited ok";
- is $id, $block_id, "replied to the ticket";
- $agent->ticket_status_is( $block_id, 'active');
+ is $id, $countermeasure_id, "replied to the ticket";
+ $agent->ticket_status_is( $countermeasure_id, 'active');
}
{
- $agent->display_ticket( $block_id);
+ $agent->display_ticket( $countermeasure_id);
$agent->follow_link_ok({ text => 'Pending Removal' }, "-> pending removal");
$agent->form_number(3);
$agent->field( UpdateContent => 'going to remove' );
$agent->click('SubmitTicket');
- $agent->ticket_status_is( $block_id, 'pending removal');
+ $agent->ticket_status_is( $countermeasure_id, 'pending removal');
}
{
my $text = <<EOF;
From: rt-test\@example.com
To: rt\@@{[RT->Config->Get('rtname')]}
-Subject: [$rtname #$block_id] This is a test
+Subject: [$rtname #$countermeasure_id] This is a test
some text
EOF
my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Countermeasures');
is $status >> 8, 0, "The mail gateway exited ok";
- is $id, $block_id, "replied to the ticket";
- $agent->ticket_status_is( $block_id, 'removed');
+ is $id, $countermeasure_id, "replied to the ticket";
+ $agent->ticket_status_is( $countermeasure_id, 'removed');
}
undef $agent;
diff --git a/t/countermeasure/pending-regexp.t b/t/countermeasure/pending-regexp.t
index 2c2b022..7edf0b1 100644
--- a/t/countermeasure/pending-regexp.t
+++ b/t/countermeasure/pending-regexp.t
@@ -5,86 +5,86 @@ use warnings;
use RT::IR::Test tests => undef;
-RT->Config->Set('RTIR_CountermeasureApproveActionRegexp', qr/TestPendingBlock/);
+RT->Config->Set('RTIR_CountermeasureApproveActionRegexp', qr/TestPendingCountermeasure/);
RT::Test->started_ok;
my $agent = default_agent();
my $rtname = RT->Config->Get('rtname');
-my $inc_id = $agent->create_incident( {Subject => "incident with block"});
-my $block_id = $agent->create_countermeasure( {
- Subject => "block",
+my $inc_id = $agent->create_incident( {Subject => "incident with countermeasure"});
+my $countermeasure_id = $agent->create_countermeasure( {
+ Subject => "countermeasure",
Incident => $inc_id,
Requestors => 'rt-test at example.com',
} );
-$agent->ticket_status_is( $block_id, 'pending activation');
+$agent->ticket_status_is( $countermeasure_id, 'pending activation');
{
my $text = <<EOF;
From: rt-test\@example.com
To: rt\@@{[RT->Config->Get('rtname')]}
-Subject: [$rtname #$block_id] This is a test
+Subject: [$rtname #$countermeasure_id] This is a test
some text
EOF
my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Countermeasures');
is $status >> 8, 0, "The mail gateway exited ok";
- is $id, $block_id, "replied to the ticket";
- $agent->ticket_status_is( $block_id, 'pending activation');
+ is $id, $countermeasure_id, "replied to the ticket";
+ $agent->ticket_status_is( $countermeasure_id, 'pending activation');
}
{
my $text = <<EOF;
From: rt-test\@example.com
To: rt\@@{[RT->Config->Get('rtname')]}
-Subject: [$rtname #$block_id] This is a test
+Subject: [$rtname #$countermeasure_id] This is a test
-TestPendingBlock
+TestPendingCountermeasure
EOF
my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Countermeasures');
is $status >> 8, 0, "The mail gateway exited ok";
- is $id, $block_id, "replied to the ticket";
- $agent->ticket_status_is( $block_id, 'active');
+ is $id, $countermeasure_id, "replied to the ticket";
+ $agent->ticket_status_is( $countermeasure_id, 'active');
}
{
- $agent->display_ticket( $block_id);
+ $agent->display_ticket( $countermeasure_id);
$agent->follow_link_ok({ text => 'Pending Removal' }, "-> pending removal");
$agent->form_number(3);
$agent->field( UpdateContent => 'going to remove' );
$agent->click('SubmitTicket');
- $agent->ticket_status_is( $block_id, 'pending removal');
+ $agent->ticket_status_is( $countermeasure_id, 'pending removal');
}
{
my $text = <<EOF;
From: rt-test\@example.com
To: rt\@@{[RT->Config->Get('rtname')]}
-Subject: [$rtname #$block_id] This is a test
+Subject: [$rtname #$countermeasure_id] This is a test
some text
EOF
my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Countermeasures');
is $status >> 8, 0, "The mail gateway exited ok";
- is $id, $block_id, "replied to the ticket";
- $agent->ticket_status_is( $block_id, 'pending removal');
+ is $id, $countermeasure_id, "replied to the ticket";
+ $agent->ticket_status_is( $countermeasure_id, 'pending removal');
}
{
my $text = <<EOF;
From: rt-test\@example.com
To: rt\@@{[RT->Config->Get('rtname')]}
-Subject: [$rtname #$block_id] This is a test
+Subject: [$rtname #$countermeasure_id] This is a test
-TestPendingBlock
+TestPendingCountermeasure
EOF
my ($status, $id) = RT::Test->send_via_mailgate($text, queue => 'Countermeasures');
is $status >> 8, 0, "The mail gateway exited ok";
- is $id, $block_id, "replied to the ticket";
- $agent->ticket_status_is( $block_id, 'removed');
+ is $id, $countermeasure_id, "replied to the ticket";
+ $agent->ticket_status_is( $countermeasure_id, 'removed');
}
undef $agent;
diff --git a/t/countermeasure/status-basics.t b/t/countermeasure/status-basics.t
index 7489460..a48ba5b 100644
--- a/t/countermeasure/status-basics.t
+++ b/t/countermeasure/status-basics.t
@@ -8,10 +8,10 @@ use RT::IR::Test tests => undef;
RT::Test->started_ok;
my $agent = default_agent();
-my $inc_id = $agent->create_incident( {Subject => "incident with block"});
-my $block_id = $agent->create_countermeasure( {Subject => "block", Incident => $inc_id});
+my $inc_id = $agent->create_incident( {Subject => "incident with countermeasure"});
+my $countermeasure_id = $agent->create_countermeasure( {Subject => "countermeasure", Incident => $inc_id});
-$agent->ticket_status_is( $block_id, 'pending activation');
+$agent->ticket_status_is( $countermeasure_id, 'pending activation');
$agent->has_tag('a', 'Remove', 'we have Remove action');
$agent->has_tag('a', 'Quick Remove', 'we have Quick Remove action');
@@ -22,7 +22,7 @@ foreach my $status( 'pending activation', 'active', 'pending removal', 'removed'
$agent->form_number(3);
$agent->field(Status => $status);
$agent->click('SaveChanges');
- $agent->ticket_status_is( $block_id, $status);
+ $agent->ticket_status_is( $countermeasure_id, $status);
}
diag "remove using edit";
@@ -37,68 +37,68 @@ diag "remove using edit";
$agent->field(Status => 'removed');
$agent->click('SaveChanges');
- $agent->ticket_status_is( $block_id, 'removed');
+ $agent->ticket_status_is( $countermeasure_id, 'removed');
}
-diag "reactivate the block using the link";
+diag "reactivate the countermeasure using the link";
{
$agent->has_tag('a', 'Activate', 'we have Activate action');
- $agent->follow_link_ok({ text => 'Activate' }, "Reactivate block");
+ $agent->follow_link_ok({ text => 'Activate' }, "Reactivate countermeasure");
$agent->form_number(3);
- $agent->field( UpdateContent => 'activating block' );
+ $agent->field( UpdateContent => 'activating countermeasure' );
$agent->click('SubmitTicket');
- $agent->ticket_status_is( $block_id, 'active');
+ $agent->ticket_status_is( $countermeasure_id, 'active');
}
diag "prepare for removing using the link";
{
$agent->has_tag('a', 'Pending Removal', 'we have Pending Removal action tab');
- $agent->follow_link_ok({ text => 'Pending Removal' }, "Prepare block for remove");
+ $agent->follow_link_ok({ text => 'Pending Removal' }, "Prepare countermeasure for remove");
$agent->form_number(3);
$agent->click('SubmitTicket');
- $agent->ticket_status_is( $block_id, 'pending removal');
+ $agent->ticket_status_is( $countermeasure_id, 'pending removal');
}
diag "test activation after reply using 'Activate' link";
{
- my $block_id = $agent->create_countermeasure( {Subject => "block", Incident => $inc_id});
- $agent->ticket_status_is( $block_id, 'pending activation');
+ my $countermeasure_id = $agent->create_countermeasure( {Subject => "countermeasure", Incident => $inc_id});
+ $agent->ticket_status_is( $countermeasure_id, 'pending activation');
$agent->follow_link_ok({ text => 'Reply' }, "Go to reply page");
$agent->form_number(3);
$agent->field( UpdateContent => 'reply' );
$agent->click('SubmitTicket');
- $agent->ticket_status_is( $block_id, 'pending activation');
+ $agent->ticket_status_is( $countermeasure_id, 'pending activation');
$agent->follow_link_ok({ text => 'Activate' }, "activate it");
$agent->form_number(3);
- $agent->field( UpdateContent => 'activating block' );
+ $agent->field( UpdateContent => 'activating countermeasure' );
$agent->click('SubmitTicket');
- $agent->ticket_status_is( $block_id, 'active');
+ $agent->ticket_status_is( $countermeasure_id, 'active');
}
diag "test activation after reply using Edit page";
{
- my $block_id = $agent->create_countermeasure( {Subject => "block", Incident => $inc_id});
- $agent->ticket_status_is( $block_id, 'pending activation');
+ my $countermeasure_id = $agent->create_countermeasure( {Subject => "countermeasure", Incident => $inc_id});
+ $agent->ticket_status_is( $countermeasure_id, 'pending activation');
$agent->follow_link_ok({ text => 'Reply' }, "Go to reply page");
$agent->form_number(3);
$agent->field( UpdateContent => 'reply' );
$agent->click('SubmitTicket');
- $agent->ticket_status_is( $block_id, 'pending activation');
+ $agent->ticket_status_is( $countermeasure_id, 'pending activation');
$agent->follow_link_ok({ text => "Edit" }, "Goto edit page");
$agent->form_number(3);
$agent->field(Status => 'active');
$agent->click('SaveChanges');
- $agent->ticket_status_is( $block_id, 'active');
+ $agent->ticket_status_is( $countermeasure_id, 'active');
}
diff --git a/t/countermeasure/status-editor-regression.t b/t/countermeasure/status-editor-regression.t
index 80eb97c..927a637 100644
--- a/t/countermeasure/status-editor-regression.t
+++ b/t/countermeasure/status-editor-regression.t
@@ -8,10 +8,10 @@ use RT::IR::Test tests => undef;
RT::Test->started_ok;
my $agent = default_agent();
-my $incident = $agent->create_incident( {Subject => 'Incident to test Block editing'});
-my $block = $agent->create_countermeasure( {Incident => $incident});
+my $incident = $agent->create_incident( {Subject => 'Incident to test Countermeasure editing'});
+my $countermeasure = $agent->create_countermeasure( {Incident => $incident});
-$agent->goto_edit_countermeasure( $block);
+$agent->goto_edit_countermeasure( $countermeasure);
$agent->content_unlike(qr{<option (?:value=.*)?>Use system default\(\)</option>}, "The option 'Use system default()' does not exist.");
diff --git a/t/custom-fields/defaults-config.t b/t/custom-fields/defaults-config.t
index d8b330b..4289e0c 100644
--- a/t/custom-fields/defaults-config.t
+++ b/t/custom-fields/defaults-config.t
@@ -29,7 +29,7 @@ RT::Test->started_ok;
my $agent = default_agent();
{
- my $incident_id; # block couldn't be created without incident id
+ my $incident_id; # countermeasure couldn't be created without incident id
foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
my $cf_name = $test_on{ $queue };
my $cf_default = $defaults->{ $cf_name };
diff --git a/t/custom-fields/ip.t b/t/custom-fields/ip.t
index 45097ce..feea212 100644
--- a/t/custom-fields/ip.t
+++ b/t/custom-fields/ip.t
@@ -40,7 +40,7 @@ my $rtir_user = RT::CurrentUser->new( rtir_user() );
diag "create a ticket via web and set IP" if $ENV{'TEST_VERBOSE'};
{
my $i = 0;
- my $incident_id; # block couldn't be created without incident id
+ my $incident_id; # countermeasure couldn't be created without incident id
foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
@@ -67,7 +67,7 @@ diag "create a ticket via web and set IP" if $ENV{'TEST_VERBOSE'};
diag "create a ticket via web with IP in message" if $ENV{'TEST_VERBOSE'};
{
my $i = 0;
- my $incident_id; # block couldn't be created without incident id
+ my $incident_id; # countermeasure couldn't be created without incident id
foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
@@ -94,7 +94,7 @@ diag "create a ticket via web with IP in message" if $ENV{'TEST_VERBOSE'};
diag "create a ticket via web with CIDR" if $ENV{'TEST_VERBOSE'};
{
my $i = 0;
- my $incident_id; # block couldn't be created without incident id
+ my $incident_id; # countermeasure couldn't be created without incident id
foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
@@ -124,7 +124,7 @@ diag "create a ticket via web with CIDR" if $ENV{'TEST_VERBOSE'};
diag "create a ticket via web with CIDR in message" if $ENV{'TEST_VERBOSE'};
{
my $i = 0;
- my $incident_id; # block couldn't be created without incident id
+ my $incident_id; # countermeasure couldn't be created without incident id
foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
@@ -154,7 +154,7 @@ diag "create a ticket via web with CIDR in message" if $ENV{'TEST_VERBOSE'};
diag "create a ticket and edit IP field using Edit page" if $ENV{'TEST_VERBOSE'};
{
my $i = 0;
- my $incident_id; # block couldn't be created without incident id
+ my $incident_id; # countermeasure couldn't be created without incident id
foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
diff --git a/t/custom-fields/ipv6.t b/t/custom-fields/ipv6.t
index 3ffd335..afd3b4c 100644
--- a/t/custom-fields/ipv6.t
+++ b/t/custom-fields/ipv6.t
@@ -77,7 +77,7 @@ diag "create a ticket via web and set IP" if $ENV{'TEST_VERBOSE'};
for my $short (sort keys %valid) {
my $full = $valid{$short};
my $abbrev = $abbrev_of{$short};
- my $incident_id; # block couldn't be created without incident id
+ my $incident_id; # countermeasure couldn't be created without incident id
foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
@@ -104,7 +104,7 @@ diag "create a ticket via web with IP in message" if $ENV{'TEST_VERBOSE'};
for my $short (sort keys %test_set) {
my $full = $valid{$short};
my $abbrev = $abbrev_of{$short};
- my $incident_id; # block couldn't be created without incident id
+ my $incident_id; # countermeasure couldn't be created without incident id
foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
@@ -131,7 +131,7 @@ diag "create a ticket via web with CIDR" if $ENV{'TEST_VERBOSE'};
for my $short (sort keys %test_cidr) {
my $full = $test_cidr{$short};
my $abbrev = $abbrev_of{$short};
- my $incident_id; # block couldn't be created without incident id
+ my $incident_id; # countermeasure couldn't be created without incident id
foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
@@ -162,7 +162,7 @@ for my $short (sort keys %test_cidr) {
my $full = $test_cidr{$short};
my $abbrev = $abbrev_of{$short};
- my $incident_id; # block couldn't be created without incident id
+ my $incident_id; # countermeasure couldn't be created without incident id
foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
@@ -191,7 +191,7 @@ for my $short (sort keys %test_cidr) {
diag "create a ticket and edit IP field using Edit page" if $ENV{'TEST_VERBOSE'};
{
my $i = 0;
- my $incident_id; # block couldn't be created without incident id
+ my $incident_id; # countermeasure couldn't be created without incident id
foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
diff --git a/t/dates/started.t b/t/dates/started.t
index a34ebc0..06c1494 100644
--- a/t/dates/started.t
+++ b/t/dates/started.t
@@ -82,31 +82,31 @@ diag "started date of an IR" if $ENV{'TEST_VERBOSE'};
ok( abs($ir->StartedObj->Unix - $ir->CreatedObj->Unix) <= 2, 'for an IR started date == linking to inc time');
}
-diag "started date of a block" if $ENV{'TEST_VERBOSE'};
+diag "started date of a countermeasure" if $ENV{'TEST_VERBOSE'};
{
my $inc_id = $agent->create_incident( {Subject => "started date"});
- my $block_id = $agent->create_countermeasure( {Subject => "started date", Incident => $inc_id});
+ my $countermeasure_id = $agent->create_countermeasure( {Subject => "started date", Incident => $inc_id});
- my $block = RT::Ticket->new( $RT::SystemUser );
- $block->Load( $block_id );
- is($block->id, $block_id, 'loaded block');
- ok( $block->StartedObj->Unix <= 0, 'a new block is not active');
+ my $countermeasure = RT::Ticket->new( $RT::SystemUser );
+ $countermeasure->Load( $countermeasure_id );
+ is($countermeasure->id, $countermeasure_id, 'loaded countermeasure');
+ ok( $countermeasure->StartedObj->Unix <= 0, 'a new countermeasure is not active');
- $agent->display_ticket( $block_id);
+ $agent->display_ticket( $countermeasure_id);
$agent->follow_link_ok({text => 'Activate'}, "activate it");
is($agent->status, 200, "request successful");
$agent->form_number(3);
- $agent->field( UpdateContent => 'activating block' );
+ $agent->field( UpdateContent => 'activating countermeasure' );
$agent->click('SubmitTicket');
is($agent->status, 200, "request successful");
DBIx::SearchBuilder::Record::Cachable::FlushCache();
- $block = RT::Ticket->new( $RT::SystemUser );
- $block->Load( $block_id );
- is($block->id, $block_id, 'loaded block');
- ok( $block->StartedObj->Unix > 0, 'activation of a block sets started date');
+ $countermeasure = RT::Ticket->new( $RT::SystemUser );
+ $countermeasure->Load( $countermeasure_id );
+ is($countermeasure->id, $countermeasure_id, 'loaded countermeasure');
+ ok( $countermeasure->StartedObj->Unix > 0, 'activation of a countermeasure sets started date');
}
diff --git a/t/walk-web.t b/t/walk-web.t
index eb0a454..8d27daa 100644
--- a/t/walk-web.t
+++ b/t/walk-web.t
@@ -16,7 +16,7 @@ my @tickets;
push @tickets, $m->create_incident({ Subject => "test Incident" });
push @tickets, $m->create_ir({ Subject => "test IR" });
push @tickets, $m->create_investigation({ Subject => "test Inv", Requestor => 'root at example.com' });
-push @tickets, $m->create_countermeasure({ Subject => "test Block", Incident => $tickets[0] });
+push @tickets, $m->create_countermeasure({ Subject => "test Countermeasure", Incident => $tickets[0] });
my @links = (
'/RTIR/',
commit 34f953bc40b3bf4bb8966f6b6609fa938d78122d
Merge: 41f461f 85afa57
Author: Shawn M Moore <shawn at bestpractical.com>
Date: Thu May 26 15:08:54 2016 -0400
Merge branch '3.4/cleanup-blocks' into 3.4.0-releng
commit 498e10eac2e3b3af79b7be143e5bb756f62417f4
Author: Dustin Graves <dustin at bestpractical.com>
Date: Thu May 26 19:46:59 2016 +0000
fix table layout on Tools/Lookup page
85afa57f introduced a regression that broke the current incident table
diff --git a/html/Callbacks/RTIR/Elements/RT__Ticket/ColumnMap/Once b/html/Callbacks/RTIR/Elements/RT__Ticket/ColumnMap/Once
index 495ce87..31266f8 100644
--- a/html/Callbacks/RTIR/Elements/RT__Ticket/ColumnMap/Once
+++ b/html/Callbacks/RTIR/Elements/RT__Ticket/ColumnMap/Once
@@ -155,7 +155,7 @@ $COLUMN_MAP->{'LookupToolIncidentActions'} = {
push @res, \'<a href="',
RT::IR->HREFTo('CreateInQueue.html?Lifecycle='.RT::IR->lifecycle_investigation
.'&Incident='. $t->id),
- \'" class="create_child_' . RT::IR->lifecycle_investigation . '">',
+ \('" class="create_child_' . RT::IR->lifecycle_investigation . '">'),
'[' . $t->loc("Investigate") .']',
\'</a>'
;
commit c03d17d744bb622c346f986cd35c0d6f27ce3c42
Author: Dustin Graves <dustin at bestpractical.com>
Date: Thu May 26 19:49:14 2016 +0000
update Tools/Lookup to use new style naming convention
964fac8 switched the css to use this new convention, which removed the
styles on the Lookup page since they still used the old naming scheme
diff --git a/html/RTIR/Tools/Elements/LookupSummary b/html/RTIR/Tools/Elements/LookupSummary
index 136c9a2..856b58f 100644
--- a/html/RTIR/Tools/Elements/LookupSummary
+++ b/html/RTIR/Tools/Elements/LookupSummary
@@ -47,7 +47,7 @@
%# END BPS TAGGED BLOCK }}}
<&| /Widgets/TitleBox,
title => loc($display_lifecycle) .': '. $q,
- class => 'tickets-list-'. $Lifecycle,
+ class => 'tickets-list-'. lc(RT::IR::TicketType( Lifecycle => $Lifecycle )),
titleright_raw => $box_actions,
title_class => 'inverse',
&>
commit 0b5c6969779ed95f0b215dd69268c75004bfbba5
Merge: 34f953b c03d17d
Author: Shawn M Moore <shawn at bestpractical.com>
Date: Thu May 26 16:19:29 2016 -0400
Merge branch '3.4/cleanup-tools-lookup' into 3.4.0-releng
commit f5f0ba14b39f79ab036cc5dc90f7023828bdd186
Author: Shawn M Moore <shawn at bestpractical.com>
Date: Thu May 26 18:02:31 2016 -0400
Flesh out docs/UPGRADING-3.4
diff --git a/docs/UPGRADING-3.4 b/docs/UPGRADING-3.4
index 58279ab..8fdb97d 100644
--- a/docs/UPGRADING-3.4
+++ b/docs/UPGRADING-3.4
@@ -19,6 +19,12 @@ page. Users will find the 'Launch Investigation' menu item missing when
creating an incident. This removal is a result of the flexibility granted by
the constituency rewrite in RTIR 3.4.
+=head3 MaxInlineBody
+
+The default value for the $MaxInlineBody config has changed from 0 (meaning
+unlimited) to 25kb. You may wish to adjust this if you were relying on
+RTIR's default.
+
=head2 Queues
It is now possible to have multiple incident report, incident,
@@ -53,14 +59,7 @@ adjust the key "Block" to "Countermeasure" (note: not "Countermeasures").
If you have any custom code that deals with Blocks queues by name,
you'll need to update it.
-=head2 Constituency support
-
-=head3 Web interface
-
-If a user has permissions to work with multiple constituencies, it is
-now possible to limit RTIR's web interface to a single constituency
-by clicking a link from the B<Work with constituency> box on the RTIR
-homepage. They can also go directly to C</RTIR/c/I<ConstituencyName>.
+=head2 Constituencies
=head3 Changes to constituencies
@@ -87,6 +86,26 @@ Unlike earlier releases of RTIR, ACLS, Scrips, Custom Fields and
queue configuration for constituency-specific queues is now drawn
explicitly from those queues.
+=head3 Web interface
+
+If a user has permissions to work with multiple constituencies, it is
+now possible to limit RTIR's web interface to a single constituency
+by clicking a link from the B<Work with constituency> box on the RTIR
+homepage. They can also go directly to C</RTIR/c/I<ConstituencyName>.
+
+=head3 Ticket linking
+
+The C<$RTIR_StrictConstituencyLinking> option replaces the old
+C<$_RTIR_Constituency_Propagation> configuration option.
+C<$RTIR_StrictConstituencyLinking> is a simple boolean which implements the
+most common behaviors of C<$_RTIR_Constituency_Propagation>.
+
+If C<$RTIR_StrictConstituencyLinking> is set to 1, any attempt to link RTIR
+tickets across constituencies will result in an error.
+
+If C<$RTIR_StrictConstituencyLinking> is set to 0, RTIR will allow users to
+link tickets across multiple constituencies.
+
=head3 Setting constituency based on email headers
RTIR 3.2 allowed sites to set ticket constituencies based on
@@ -98,4 +117,4 @@ message headers to set RTIR constituencies is no longer available.
=head3 ForwardMessage
-DutyTeams now have C<ForwardMessage> right by default.
+DutyTeams now have the C<ForwardMessage> right by default.
commit 1ec9e40381d972e97508aeaa0ba5ff51eb4ed89d
Author: Shawn M Moore <shawn at bestpractical.com>
Date: Thu May 26 18:10:24 2016 -0400
Bump version from 3.4 to 4.0
diff --git a/MANIFEST b/MANIFEST
index 8426991..e40e9b7 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -10,7 +10,7 @@ docs/UPGRADING-2.4
docs/UPGRADING-2.6
docs/UPGRADING-3.0
docs/UPGRADING-3.2
-docs/UPGRADING-3.4
+docs/UPGRADING-4.0
etc/add_constituency.in
etc/initialdata
etc/logo/gif/rtir-logo-badge-3d.gif
diff --git a/README b/README
index 5c289e4..6b68e23 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ touch with us at <sales at bestpractical.com>.
REQUIRED PACKAGES:
------------------
-o RT 4.4.0 or newer releases of the 4.4 series.
+o RT version 4.4.0 or later.
o Net::Whois::RIPE 1.31 is bundled with RTIR for compatibility with the
API RTIR uses and for a fix to run without warnings under perl 5.18.
@@ -103,13 +103,13 @@ o See "perldoc /opt/rt4/bin/rt-mailgate" for more info about the rt-mailgate
o If you're configuring RTIR with support for multiple constituencies, please
refer to the instructions in the file docs/Constituencies.pod which is also
- viewable here http://www.bestpractical.com/docs/rtir/3.4/Constituencies.html
+ viewable here http://www.bestpractical.com/docs/rtir/4.0/Constituencies.html
Documentation for RTIR
----------------------
* Documents included with RTIR are also available for browsing at
- http://www.bestpractical.com/docs/rtir/3.4/
+ http://www.bestpractical.com/docs/rtir/4.0/
* This README file
@@ -117,24 +117,24 @@ Documentation for RTIR
* docs/UPGRADING-*
Version specific upgrading files. If upgrading from 3.0, you
- would read the UPGRADING-3.0, UPGRADING-3.2, and UPGRADING-3.4 files.
+ would read the UPGRADING-3.0, UPGRADING-3.2, and UPGRADING-4.0 files.
* docs/Tutorial.pod
- ( also at http://bestpractical.com/docs/rtir/3.4/Tutorial )
+ ( also at http://bestpractical.com/docs/rtir/4.0/Tutorial )
Extended information about ticket merging
* docs/Constituencies.pod
- ( also at http://bestpractical.com/docs/rtir/3.4/Constituencies )
+ ( also at http://bestpractical.com/docs/rtir/4.0/Constituencies )
Information about setting up RTIR with multiple user constituencies
* docs/AdministrationTutorial.pod
- ( also at http://bestpractical.com/docs/rtir/3.4/AdministrationTutorial )
+ ( also at http://bestpractical.com/docs/rtir/4.0/AdministrationTutorial )
Information about setting up RTIR for Administrators
* etc/RTIR_Config.pm
(Contains a number of RTIR-specific configuration options and
instructions for their use)
- http://www.bestpractical.com/docs/rtir/3.4/RTIR_Config.html
+ http://www.bestpractical.com/docs/rtir/4.0/RTIR_Config.html
* RTIR mailing list
Subscribe by sending mail to rtir-request at lists.bestpractical.com
diff --git a/docs/AdministrationTutorial.pod b/docs/AdministrationTutorial.pod
index 6466618..ddcc3c7 100644
--- a/docs/AdministrationTutorial.pod
+++ b/docs/AdministrationTutorial.pod
@@ -47,7 +47,7 @@ of L</Scrips> below.
While RTIR ships with four queues by default (Incident Reports, Incidents,
Investigations, and Countermeasures) you can create your own versions of these
-queues. This functionality (new in RTIR 3.4) is what powers the
+queues. This functionality (new in RTIR 4.0) is what powers the
L<Constituencies> feature, but its use is not limited to Constituencies. For
example you can have multiple queues for Incident Reports, one for each of your
monitoring tools, each with its own set of custom fields, watchers, automation
diff --git a/docs/Constituencies.pod b/docs/Constituencies.pod
index 954f1b8..d54bf89 100644
--- a/docs/Constituencies.pod
+++ b/docs/Constituencies.pod
@@ -26,9 +26,9 @@ configuration that applies to all constituencies. This guide
will help you configure RTIR to manage multiple constituencies.
The implementation of the constituencies feature was updated
-in RTIR 3.4 and is described here. If you were using this
+in RTIR 4.0 and is described here. If you were using this
functionality in previous versions, you can read about specific
-changes in L<UPGRADING-3.4>.
+changes in L<UPGRADING-4.0>.
=head2 Definitions
@@ -110,7 +110,7 @@ However, to get advanced control over constituencies you have to create addition
objects in the system. The steps below describe how to do this manually. A
script (F<bin/add_constituency>) is also provided which helps add new constituency
values, along with their associated groups and queues. In previous versions of RTIR,
-these queues were a hidden implementation detail. In RTIR 3.4, each constituency has
+these queues were a hidden implementation detail. In RTIR 4.0, each constituency has
its own queues, which work like regular RT queues.
=head2 Manually Managing Constituency Values
@@ -162,7 +162,7 @@ groups created and modify them as needed.
=head2 Constituency Propagation
-Starting in RTIR 3.4, the C<$RTIR_StrictConstituencyLinking> option replaces the old C<$_RTIR_Constituency_Propagation> configuration option.
+Starting in RTIR 4.0, the C<$RTIR_StrictConstituencyLinking> option replaces the old C<$_RTIR_Constituency_Propagation> configuration option.
C<$RTIR_StrictConstituencyLinking> is a simple boolean which implements the most common behaviors of C<$_RTIR_Constituency_Propagation>.
diff --git a/docs/UPGRADING b/docs/UPGRADING
index 8346725..44a811e 100644
--- a/docs/UPGRADING
+++ b/docs/UPGRADING
@@ -36,7 +36,7 @@ so don't copy an old RTIR's files.
RTIR 3.2 is only compatible with RT 4.2 releases.
- RTIR 3.4 is only compatible with RT 4.4 releases.
+ RTIR 4.0 is only compatible with RT 4.4 releases.
=item 3
@@ -51,7 +51,7 @@ Install the new version of RTIR. B<DO NOT> run C<make initdb>.
Review all of the upgrade notes in docs/UPGRADING-*. If you were
coming from 2.6.1, you would read UPGRADING-2.6, UPGRADING-3.0, UPGRADING-3.2,
-and UPGRADING-3.4.
+and UPGRADING-4.0.
=item 6
diff --git a/docs/UPGRADING-3.4 b/docs/UPGRADING-4.0
similarity index 95%
rename from docs/UPGRADING-3.4
rename to docs/UPGRADING-4.0
index 8fdb97d..18b0743 100644
--- a/docs/UPGRADING-3.4
+++ b/docs/UPGRADING-4.0
@@ -1,7 +1,7 @@
-=head1 Upgrading to 3.4
+=head1 Upgrading to 4.0
The following describes some of the key components of the upgrade
-to RTIR 3.4 from RTIR 3.2. The other UPGRADING documents contain
+to RTIR 4.0 from RTIR 3.2. The other UPGRADING documents contain
details for previous versions.
=head2 Web interface
@@ -17,7 +17,7 @@ suggestions for filling out RTIR's menus with additional useful functionality.
It is no longer possible to launch an investigation on the incident creation
page. Users will find the 'Launch Investigation' menu item missing when
creating an incident. This removal is a result of the flexibility granted by
-the constituency rewrite in RTIR 3.4.
+the constituency rewrite in RTIR 4.0.
=head3 MaxInlineBody
@@ -63,7 +63,7 @@ you'll need to update it.
=head3 Changes to constituencies
-RTIR 3.4 features a major overhaul of the constituency system. The
+RTIR 4.0 features a major overhaul of the constituency system. The
standard upgrade procedure should migrate old constituencies to the
new system.
diff --git a/html/RTIR/Create.html b/html/RTIR/Create.html
index 21667fa..21e6000 100644
--- a/html/RTIR/Create.html
+++ b/html/RTIR/Create.html
@@ -380,7 +380,7 @@ if (RT::IR->IsCountermeasureQueue($QueueObj)
my $Type = RT::IR::TicketType( Lifecycle => $Lifecycle);
-# As of RTIR 3.4, that's only true for Incidents
+# As of RTIR 4.0, that's only true for Incidents
# If there's an RTIR specific create page for this kind of ticket, show that
if ( $m->comp_exists("/RTIR/$Type/Create.html") ) {
RT::Interface::Web::Redirect(RT::IR->HREFTo(
-----------------------------------------------------------------------
More information about the rt-commit
mailing list