[Rt-commit] [rtir] 07/10: Rename RTIR_DisableBlocksQueue to RTIR_DisableCountermeasures
Shawn Moore
shawn at bestpractical.com
Wed Feb 24 19:04:38 EST 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 f09061f32d5fa5a3bdbc067f06d98c5b1db168c9
Author: Shawn M Moore <shawn at bestpractical.com>
Date: Wed Feb 24 23:59:58 2016 +0000
Rename RTIR_DisableBlocksQueue to RTIR_DisableCountermeasures
---
docs/AdministrationTutorial.pod | 2 +-
etc/RTIR_Config.pm | 4 ++--
html/Callbacks/RTIR/Elements/MakeClicky/Default | 2 +-
html/Callbacks/RTIR/Elements/Tabs/Privileged | 2 +-
html/RTIR/Create.html | 2 +-
html/RTIR/Display.html | 2 +-
html/RTIR/Edit.html | 2 +-
html/RTIR/Incident/Elements/ShowChildren | 2 +-
html/RTIR/Incident/Reply/Refine.html | 2 +-
html/RTIR/Incident/Reply/index.html | 4 ++--
html/RTIR/Tools/Elements/LookupRelatedTickets | 2 +-
html/RTIR/Tools/Elements/LookupSummary | 2 +-
lib/RT/Action/RTIR_ResolveChildren.pm | 2 +-
13 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/docs/AdministrationTutorial.pod b/docs/AdministrationTutorial.pod
index 0858b64..358b378 100644
--- a/docs/AdministrationTutorial.pod
+++ b/docs/AdministrationTutorial.pod
@@ -22,7 +22,7 @@ your custom configuration values there.
You may disable the Blocks queue by putting the following into your
F<RTIR_SiteConfig.pm> config:
- Set($RTIR_DisableBlocksQueue, 1);
+ Set($RTIR_DisableCountermeasures, 1);
You will probably also want to disable the Queue using the RT
Administrative interface. Tools -> Configuration -> Queues -> Blocks,
diff --git a/etc/RTIR_Config.pm b/etc/RTIR_Config.pm
index 55eda07..33351a2 100644
--- a/etc/RTIR_Config.pm
+++ b/etc/RTIR_Config.pm
@@ -599,13 +599,13 @@ Set(%CustomFieldGroupings,
=over 4
-=item C<$RTIR_DisableBlocksQueue>
+=item C<$RTIR_DisableCountermeasures>
If true then Countermeasure queue functionality inactive and disabled.
=cut
-Set($RTIR_DisableBlocksQueue, 0);
+Set($RTIR_DisableCountermeasures, 0);
=item C<$RTIR_BlockAproveActionRegexp>
diff --git a/html/Callbacks/RTIR/Elements/MakeClicky/Default b/html/Callbacks/RTIR/Elements/MakeClicky/Default
index daf9553..1ab36f5 100644
--- a/html/Callbacks/RTIR/Elements/MakeClicky/Default
+++ b/html/Callbacks/RTIR/Elements/MakeClicky/Default
@@ -104,7 +104,7 @@ my %actions;
my $escaped_host = $escaper->($args{host});
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_DisableBlocksQueue') ) {
+ if ( $args{incident} && !RT->Config->Get('RTIR_DisableCountermeasures') ) {
$result .= qq{<a class="button" href="} .
RT::IR->HREFTo("Create.html?Incident=".$args{incident}."&Lifecycle=".RT::IR->lifecycle_countermeasure.qq{&IP-Value=$escaped_host})
.qq{">block</a>};
diff --git a/html/Callbacks/RTIR/Elements/Tabs/Privileged b/html/Callbacks/RTIR/Elements/Tabs/Privileged
index 94ad101..2672ec2 100644
--- a/html/Callbacks/RTIR/Elements/Tabs/Privileged
+++ b/html/Callbacks/RTIR/Elements/Tabs/Privileged
@@ -126,7 +126,7 @@ $root->child(
launch => title => loc('Launch'),
path => RT::IR->HREFTo('Create.html?Lifecycle='.RT::IR->lifecycle_investigation, IncludeWebPath => 0),
);
-unless ( RT->Config->Get('RTIR_DisableBlocksQueue') ) {
+unless ( RT->Config->Get('RTIR_DisableCountermeasures') ) {
$root->child(
blocks => title => loc('Countermeasures'),
path => RT::IR->HREFTo('Search/Results.html?Lifecycle='.RT::IR->lifecycle_countermeasure, IncludeWebPath => 0)
diff --git a/html/RTIR/Create.html b/html/RTIR/Create.html
index cf69421..dbc0412 100644
--- a/html/RTIR/Create.html
+++ b/html/RTIR/Create.html
@@ -378,7 +378,7 @@ my $ticket = RT::Ticket->new($session{'CurrentUser'}); # empty ticket object
if (RT::IR->IsCountermeasureQueue($QueueObj)
- && RT->Config->Get('RTIR_DisableBlocksQueue') ) {
+ && RT->Config->Get('RTIR_DisableCountermeasures') ) {
Abort(loc("Countermeasure queues are disabled via config file"));
}
diff --git a/html/RTIR/Display.html b/html/RTIR/Display.html
index 0f36dbd..fdf26f4 100644
--- a/html/RTIR/Display.html
+++ b/html/RTIR/Display.html
@@ -186,7 +186,7 @@ RT::Interface::Web::Redirect(RT->Config->Get('WebURL')
. 'Ticket/Display.html?'
. $m->comp('/Elements/QueryString', %ARGS )) unless $Type;
-if (RT::IR->IsCountermeasureQueue($QueueObj) && RT->Config->Get('RTIR_DisableBlocksQueue') ) {
+if (RT::IR->IsCountermeasureQueue($QueueObj) && RT->Config->Get('RTIR_DisableCountermeasures') ) {
Abort(loc("Countermeasure queues are disabled via config file"));
}
diff --git a/html/RTIR/Edit.html b/html/RTIR/Edit.html
index e0735cb..c75d0b1 100644
--- a/html/RTIR/Edit.html
+++ b/html/RTIR/Edit.html
@@ -174,7 +174,7 @@ RT::Interface::Web::Redirect(RT->Config->Get('WebURL').'Ticket/Display.html?'.
$m->comp('/Elements/QueryString', %ARGS )) unless $Type;
if (RT::IR->IsCountermeasureQueue($Ticket->QueueObj)
- && RT->Config->Get('RTIR_DisableBlocksQueue') ) {
+ && RT->Config->Get('RTIR_DisableCountermeasures') ) {
Abort(loc("Countermeasure queues are disabled via config file"));
}
diff --git a/html/RTIR/Incident/Elements/ShowChildren b/html/RTIR/Incident/Elements/ShowChildren
index 6402c72..7e23ab4 100644
--- a/html/RTIR/Incident/Elements/ShowChildren
+++ b/html/RTIR/Incident/Elements/ShowChildren
@@ -82,7 +82,7 @@ $Rows => 8
<%INIT>
-return if $Lifecycle eq RT::IR->lifecycle_countermeasure && RT->Config->Get('RTIR_DisableBlocksQueue');
+return if $Lifecycle eq RT::IR->lifecycle_countermeasure && RT->Config->Get('RTIR_DisableCountermeasures');
my $FriendlyLifecycle = RT::IR::FriendlyLifecycle($Lifecycle);
diff --git a/html/RTIR/Incident/Reply/Refine.html b/html/RTIR/Incident/Reply/Refine.html
index 0c458dd..e5b8590 100644
--- a/html/RTIR/Incident/Reply/Refine.html
+++ b/html/RTIR/Incident/Reply/Refine.html
@@ -48,7 +48,7 @@
<%INIT>
my @lifecycles = (RT::IR->lifecycle_report);
push @lifecycles, RT::IR->lifecycle_investigation if $ARGS{'All'};
-push @lifecycles, RT::IR->lifecycle_countermeasure if $ARGS{'All'} && !RT->Config->Get('RTIR_DisableBlocksQueue');
+push @lifecycles, RT::IR->lifecycle_countermeasure if $ARGS{'All'} && !RT->Config->Get('RTIR_DisableCountermeasures');
return $m->comp(
'/RTIR/Search/Elements/RefinePage',
diff --git a/html/RTIR/Incident/Reply/index.html b/html/RTIR/Incident/Reply/index.html
index e92d7db..cec521e 100644
--- a/html/RTIR/Incident/Reply/index.html
+++ b/html/RTIR/Incident/Reply/index.html
@@ -91,7 +91,7 @@
OrderBy => $OrderBy,
Order => $Order,
&>
-% unless( RT->Config->Get('RTIR_DisableBlocksQueue') ) {
+% unless( RT->Config->Get('RTIR_DisableCountermeasures') ) {
<h2><&|/l&>Countermeasure Correspondents</&></h2>
<& /RTIR/Search/Elements/ShowResults,
BaseURL => $BaseURL,
@@ -242,7 +242,7 @@ if ($Status eq 'resolved') {
my @lifecycles = (RT::IR->lifecycle_report);
push @lifecycles, RT::IR->lifecycle_investigation if $All;
-push @lifecycles, RT::IR->lifecycle_countermeasure unless RT->Config->Get('RTIR_DisableBlocksQueue');
+push @lifecycles, RT::IR->lifecycle_countermeasure unless RT->Config->Get('RTIR_DisableCountermeasures');
$Query ||= RT::IR->ActiveQuery( Lifecycle => \@lifecycles );
diff --git a/html/RTIR/Tools/Elements/LookupRelatedTickets b/html/RTIR/Tools/Elements/LookupRelatedTickets
index b485ec7..63ea242 100644
--- a/html/RTIR/Tools/Elements/LookupRelatedTickets
+++ b/html/RTIR/Tools/Elements/LookupRelatedTickets
@@ -60,7 +60,7 @@
</td><td width="50%" valign="top">
-% unless ( RT->Config->Get('RTIR_DisableBlocksQueue') ) {
+% unless ( RT->Config->Get('RTIR_DisableCountermeasures') ) {
<& LookupSummary, %ARGS, Lifecycle => RT::IR->lifecycle_countermeasure, Query => $query &>
% }
diff --git a/html/RTIR/Tools/Elements/LookupSummary b/html/RTIR/Tools/Elements/LookupSummary
index 36a3418..33d2ff6 100644
--- a/html/RTIR/Tools/Elements/LookupSummary
+++ b/html/RTIR/Tools/Elements/LookupSummary
@@ -115,7 +115,7 @@ if ( $TicketObj && RT::IR->IsIncidentQueue($TicketObj->QueueObj)
Requestors => $q,
)),
};
- } elsif ( $Lifecycle eq RT::IR->lifecycle_countermeasure && $LookupType eq 'ip' && !RT->Config->Get('RTIR_DisableBlocksQueue') ) {
+ } elsif ( $Lifecycle eq RT::IR->lifecycle_countermeasure && $LookupType eq 'ip' && !RT->Config->Get('RTIR_DisableCountermeasures') ) {
push @box_actions, {
title => loc('Create'),
path => RT::IR->HREFTo("Create.html?". $m->comp('/Elements/QueryString',
diff --git a/lib/RT/Action/RTIR_ResolveChildren.pm b/lib/RT/Action/RTIR_ResolveChildren.pm
index 29ef016..418346f 100644
--- a/lib/RT/Action/RTIR_ResolveChildren.pm
+++ b/lib/RT/Action/RTIR_ResolveChildren.pm
@@ -78,7 +78,7 @@ sub Commit {
my $id = $incident->Id;
foreach my $lifecycle ( RT::IR->lifecycle_report, RT::IR->lifecycle_investigation, RT::IR->lifecycle_countermeasure ) {
- next if $lifecycle eq RT::IR->lifecycle_countermeasure && RT->Config->Get('RTIR_DisableBlocksQueue');
+ next if $lifecycle eq RT::IR->lifecycle_countermeasure && RT->Config->Get('RTIR_DisableCountermeasures');
my $members = RT::IR->IncidentChildren(
$incident, Lifecycle => $lifecycle,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the rt-commit
mailing list