[Rt-commit] [rtir] 23/33: Rename $RTIR_BlockAproveActionRegexp to $RTIR_CountermeasureApproveActionRegexp

Shawn Moore shawn at bestpractical.com
Fri May 13 20:21:35 EDT 2016


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 c2be6116ba11eb6084ee68d6b5e0940a794faf76
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Thu Feb 25 00:49:12 2016 +0000

    Rename $RTIR_BlockAproveActionRegexp to $RTIR_CountermeasureApproveActionRegexp
---
 docs/AdministrationTutorial.pod               | 2 +-
 etc/RTIR_Config.pm                            | 4 ++--
 lib/RT/Action/RTIR_SetCountermeasureStatus.pm | 4 ++--
 t/countermeasure/pending-no-regexp.t          | 2 +-
 t/countermeasure/pending-regexp.t             | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/AdministrationTutorial.pod b/docs/AdministrationTutorial.pod
index 8132c1a..31b418a 100644
--- a/docs/AdministrationTutorial.pod
+++ b/docs/AdministrationTutorial.pod
@@ -190,7 +190,7 @@ RT's default L<RT::Action::AutoOpen> is disabled for countermeasures to
 avoid unwanted changes of status from 'pending activation'
 to 'active'.
 
-See also the C<$RTIR_BlockAproveActionRegexp> option
+See also the C<$RTIR_CountermeasureApproveActionRegexp> option
 in the config.
 
 =item On Linking To Incident Activate Report
diff --git a/etc/RTIR_Config.pm b/etc/RTIR_Config.pm
index 8a53111..85fa3bc 100644
--- a/etc/RTIR_Config.pm
+++ b/etc/RTIR_Config.pm
@@ -607,7 +607,7 @@ If true then Countermeasure queue functionality inactive and disabled.
 
 Set($RTIR_DisableCountermeasures, 0);
 
-=item C<$RTIR_BlockAproveActionRegexp>
+=item C<$RTIR_CountermeasureApproveActionRegexp>
 
 When requestor replies on the block in pending state RTIR
 changes state, you can set regular expresion so state would
@@ -617,7 +617,7 @@ See also L<RT::Action::RTIR_SetCountermeasureStatus/DESCRIPTION>.
 
 =cut
 
-Set($RTIR_BlockAproveActionRegexp, undef);
+Set($RTIR_CountermeasureApproveActionRegexp, undef);
 
 =back
 
diff --git a/lib/RT/Action/RTIR_SetCountermeasureStatus.pm b/lib/RT/Action/RTIR_SetCountermeasureStatus.pm
index 5410602..f1dc9ca 100644
--- a/lib/RT/Action/RTIR_SetCountermeasureStatus.pm
+++ b/lib/RT/Action/RTIR_SetCountermeasureStatus.pm
@@ -60,7 +60,7 @@ RT::Action::RTIR_SetCountermeasureStatus - sets status of the countermeasure acc
 
 If transaction is inbound and status is pending then
 change it to corresponding not pending status. This
-rule can be protected with C<$RTIR_BlockAproveActionRegexp>
+rule can be protected with C<$RTIR_CountermeasureApproveActionRegexp>
 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.
@@ -89,7 +89,7 @@ sub Commit {
 
     my $current = lc $t->Status;
     if ( $current =~ /^pending / && $txn->IsInbound ) {
-        if ( my $re = RT->Config->Get('RTIR_BlockAproveActionRegexp') ) {
+        if ( my $re = RT->Config->Get('RTIR_CountermeasureApproveActionRegexp') ) {
             my $content = $txn->Content;
             return 1 if !$content || $content !~ /$re/;
         }
diff --git a/t/countermeasure/pending-no-regexp.t b/t/countermeasure/pending-no-regexp.t
index 56cb621..c08718d 100644
--- a/t/countermeasure/pending-no-regexp.t
+++ b/t/countermeasure/pending-no-regexp.t
@@ -5,7 +5,7 @@ use warnings;
 
 use RT::IR::Test tests => undef;
 
-RT->Config->Set('RTIR_BlockAproveActionRegexp', undef);
+RT->Config->Set('RTIR_CountermeasureApproveActionRegexp', undef);
 
 RT::Test->started_ok;
 my $agent = default_agent();
diff --git a/t/countermeasure/pending-regexp.t b/t/countermeasure/pending-regexp.t
index 6f2a102..2c2b022 100644
--- a/t/countermeasure/pending-regexp.t
+++ b/t/countermeasure/pending-regexp.t
@@ -5,7 +5,7 @@ use warnings;
 
 use RT::IR::Test tests => undef;
 
-RT->Config->Set('RTIR_BlockAproveActionRegexp', qr/TestPendingBlock/);
+RT->Config->Set('RTIR_CountermeasureApproveActionRegexp', qr/TestPendingBlock/);
 
 RT::Test->started_ok;
 my $agent = default_agent();

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


More information about the rt-commit mailing list