[Rt-commit] [rtir] 03/04: Fix stray references of blocks to be countermeasures

[Shawn Moore]

This is an automated email from the git hooks/post-receive script.

shawn pushed a commit to branch 3.4/countermeasures
in repository rtir.

commit fdc75b4eb5f49c12da28d30b53b7a9c714759e58
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Thu Feb 25 00:38:11 2016 +0000

    Fix stray references of blocks to be countermeasures
---
 etc/RTIR_Config.pm                   | 8 ++++----
 lib/RT/Action/RTIR_SetBlockStatus.pm | 4 ++--
 lib/RT/IR.pm                         | 4 ++--
 t/constituency/email.t               | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/etc/RTIR_Config.pm b/etc/RTIR_Config.pm
index 33351a2..edf3fd7 100644
--- a/etc/RTIR_Config.pm
+++ b/etc/RTIR_Config.pm
@@ -234,10 +234,10 @@ Set(
 =item C<%RTIR_IncidentChildren>
 
 Option controls relations between an incident and
-reports, investigations and blocks. Each entry
-of the hash is a pair where key is type of child
-and value is hash with Multiple and Required keys
-and boolean values, for example:
+reports, investigations and countermeasures. Each
+entry of the hash is a pair where key is type of
+child and value is hash with Multiple and Required
+keys and boolean values, for example:
 
     Set(%RTIR_IncidentChildren,
         Report => {
diff --git a/lib/RT/Action/RTIR_SetBlockStatus.pm b/lib/RT/Action/RTIR_SetBlockStatus.pm
index 7be5a18..7484384 100644
--- a/lib/RT/Action/RTIR_SetBlockStatus.pm
+++ b/lib/RT/Action/RTIR_SetBlockStatus.pm
@@ -65,9 +65,9 @@ option. Content of the transaction should match the regexp
 if it's defined. Statuses are hardcoded and can not be
 changed or this will not work properly.
 
-If block is in an inactive status (by default 'removed')
+If countermeasure is in an inactive status (by default 'removed')
 then status changed to first possible active status
-for blocks' lifecycle (by default 'active').
+for countermeasures's lifecycle (by default 'active').
 
 In all other cases status left unchanged.
 
diff --git a/lib/RT/IR.pm b/lib/RT/IR.pm
index 991bc69..4cf8fdb 100644
--- a/lib/RT/IR.pm
+++ b/lib/RT/IR.pm
@@ -335,8 +335,8 @@ lifecycles.
 Examples:
 
     RT::IR->Statuses()
-    RT::IR->Statuses( Lifecycle => 'blocks' );
-    RT::IR->Statuses( Lifecycle => [ 'blocks', 'incident_reports' ] );
+    RT::IR->Statuses( Lifecycle => 'countermeasures' );
+    RT::IR->Statuses( Lifecycle => [ 'countermeasures', 'incident_reports' ] );
     RT::IR->Statuses( Active => 0, Inactive => 1 );
 
 =cut
diff --git a/t/constituency/email.t b/t/constituency/email.t
index 14135eb..1d20933 100644
--- a/t/constituency/email.t
+++ b/t/constituency/email.t
@@ -91,7 +91,7 @@ diag "create a ticket via gate using Extension header" if $ENV{'TEST_VERBOSE'};
     my $val = (grep lc($_) ne lc($default), @values)[0];
     ok $val, 'find not default value';
 
-    my $incident_id; # block couldn't be created without incident id
+    my $incident_id; # countermeasure can'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'};
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.