[Rt-commit] [rtir] 15/33: Change blocks to countermeasures in comments and internal documentation

[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 60d0745465dfb635f45e12af67dd67f90693dd4a
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Thu Feb 25 00:03:00 2016 +0000

    Change blocks to countermeasures in comments and internal documentation
---
 html/RTIR/Incident/Display.html            | 2 +-
 lib/RT/Action/RTIR_ChangeChildOwnership.pm | 2 +-
 lib/RT/IR.pm                               | 4 ++--
 t/constituency/basics.t                    | 2 +-
 t/constituency/propagation-inherit.t       | 2 +-
 t/constituency/propagation-reject.t        | 2 +-
 t/custom-fields/on-transactions.t          | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/html/RTIR/Incident/Display.html b/html/RTIR/Incident/Display.html
index 33cc35a..461436f 100644
--- a/html/RTIR/Incident/Display.html
+++ b/html/RTIR/Incident/Display.html
@@ -203,7 +203,7 @@ my $DoLinks = sub {
         }
     }
 
-    # Blocks or Incedent Reports can have multiple incidents
+    # Countermeasure or Incident Reports can have multiple incidents
     my $Type = RT::IR::TicketType( Ticket => $child );
     my $config = RT->Config->Get('RTIR_IncidentChildren')->{$Type};
     unless( $config->{'Multiple'} ) {
diff --git a/lib/RT/Action/RTIR_ChangeChildOwnership.pm b/lib/RT/Action/RTIR_ChangeChildOwnership.pm
index 9ce4b41..b24af09 100644
--- a/lib/RT/Action/RTIR_ChangeChildOwnership.pm
+++ b/lib/RT/Action/RTIR_ChangeChildOwnership.pm
@@ -73,7 +73,7 @@ sub Commit {
         $action_cb = sub { return $_[0]->SetOwner( $transaction->NewValue ) }
     }
 
-    # change owner of child Incident Reports, Investigations, Blocks
+    # change owner of child Incident Reports, Investigations, Countermeasures
     my $query =  "(Lifecycle = '".RT::IR->lifecycle_report."'"
                 ." OR Lifecycle ='". RT::IR->lifecycle_investigation."'"
                 ." OR Lifecycle = '".RT::IR->lifecycle_countermeasure."'"
diff --git a/lib/RT/IR.pm b/lib/RT/IR.pm
index b95d5ce..991bc69 100644
--- a/lib/RT/IR.pm
+++ b/lib/RT/IR.pm
@@ -569,7 +569,7 @@ sub IncidentHasActiveChildren {
 =head2 IsLinkedToActiveIncidents $ChildObj [$IncidentObj]
 
 Returns number of active incidents linked to child ticket
-(IR, Investigation, Block or other). If second argument provided
+(IR, Investigation, Countermeasure or other). If second argument provided
 then it's excluded from count.
 
 When function return zero that means that object has no active
@@ -774,7 +774,7 @@ sub FilterRTAddresses {
     return $found;
 }
 
-# Skip the global AutoOpen and AutoOpenInactive scrip on Blocks and Incident Reports
+# Skip the global AutoOpen and AutoOpenInactive scrip on Countermeasures and Incident Reports
 # This points to RTIR wanting to muck with the global scrips using the 4.2 scrips
 # organization, although it possibly messes with Admins expectations of 'contained Queues'
 # We have to hit both because the first is installed on upgraded RTs while the latter is
diff --git a/t/constituency/basics.t b/t/constituency/basics.t
index 38a57e2..1d8f697 100644
--- a/t/constituency/basics.t
+++ b/t/constituency/basics.t
@@ -65,7 +65,7 @@ diag "check that there is no option to set 'no value' on create" if $ENV{'TEST_V
 
 diag "create a ticket via web and set field" if $ENV{'TEST_VERBOSE'};
 {
-    # we skip blocks here, as they are always connected to
+    # we skip countermeasures here, as they are always connected to
     # an incident and constituency inheritance comes into game
     foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations' ) {
         diag "create a ticket in the '$queue' queue" if $ENV{'TEST_VERBOSE'};
diff --git a/t/constituency/propagation-inherit.t b/t/constituency/propagation-inherit.t
index da3f8ff..c82a6fc 100644
--- a/t/constituency/propagation-inherit.t
+++ b/t/constituency/propagation-inherit.t
@@ -224,7 +224,7 @@ diag "check that constituency propagates from a child to a parent after 'Edit',
 diag "check that constituency propagates from a child to a parent after 'Edit', and back"
     if $ENV{'TEST_VERBOSE'};
 {
-    # can not test this for blocks as those require incident on create
+    # can not test this for countermeasures as those require incident on create
     foreach my $queue( 'Incident Reports', 'Investigations' ) {
         diag "create an incident for linking" if $ENV{'TEST_VERBOSE'};
 
diff --git a/t/constituency/propagation-reject.t b/t/constituency/propagation-reject.t
index c468ee4..08c5b06 100644
--- a/t/constituency/propagation-reject.t
+++ b/t/constituency/propagation-reject.t
@@ -222,7 +222,7 @@ diag "create an IR create an Incident with different constituency"
 diag "check that we can change constituency of an unlinked ticket using 'Edit' page"
     if $ENV{'TEST_VERBOSE'};
 {
-    # blocks are always linked to an incident
+    # countermeasures are always linked to an incident
     foreach my $queue( 'Incidents', 'Incident Reports', 'Investigations' ) {
         my $id = $agent->create_rtir_ticket_ok(
             $queue .' - GOVNET',
diff --git a/t/custom-fields/on-transactions.t b/t/custom-fields/on-transactions.t
index 3e8dd31..b05bb13 100644
--- a/t/custom-fields/on-transactions.t
+++ b/t/custom-fields/on-transactions.t
@@ -49,7 +49,7 @@ foreach my $qname ('Incident Reports', 'Investigations', 'Countermeasures') {
     my $input = $form->find_input( $input_name );
     ok $input, 'input for the field is on the page';
 
-    $agent->field( Incident => $inc_id ); # for blocks
+    $agent->field( Incident => $inc_id ); # for countermeasures
     $agent->field( Requestors => 'rt-test at example.com' ); # for invs
     $agent->field( $input_name => 'magic' );
     $agent->click('Create');

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