[Rt-commit] rtir branch, 3.4/countermeasures, updated. 3.3.0-97-g208ce1e

[Shawn Moore]

The branch, 3.4/countermeasures has been updated
       via  208ce1eef8a4f4cc5798ca6747101992c9ac3448 (commit)
      from  39c6332cff290d0b4b6f46deb5aff18e767cb863 (commit)

Summary of changes:
 etc/upgrade/3.3.2/content | 4 ++--
 etc/upgrade/3.3.4/content | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 208ce1eef8a4f4cc5798ca6747101992c9ac3448
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Fri May 20 18:14:32 2016 +0000

    Have 3.3.2 and 3.3.4 upgrade scripts use Countermeasures not Blocks

diff --git a/etc/upgrade/3.3.2/content b/etc/upgrade/3.3.2/content
index 424956e..4bae1dc 100644
--- a/etc/upgrade/3.3.2/content
+++ b/etc/upgrade/3.3.2/content
@@ -18,7 +18,7 @@ our @CustomFields = (
         Disabled    => 0,
         LookupType  => 'RT::Queue',
         Description => 'If set, defines the default WHOIS server for an RTIR Queue',
-        ApplyTo     => [ 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ],
+        ApplyTo     => [ 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ],
     },
 
 );
@@ -87,7 +87,7 @@ our @Final = (
         }
 
         # move tickets
-        for my $queue ( 'Incidents', 'Incident Reports', 'Investigations', 'Blocks' ) {
+        for my $queue ( 'Incidents', 'Incident Reports', 'Investigations', 'Countermeasures' ) {
             my $tickets = RT::Tickets->new( RT->SystemUser );
             $tickets->FromSQL( qq{Queue = '$queue' AND CF.{Constituency} IS NOT NULL} );
             while ( my $ticket = $tickets->Next ) {
diff --git a/etc/upgrade/3.3.4/content b/etc/upgrade/3.3.4/content
index 0e1513d..791255c 100644
--- a/etc/upgrade/3.3.4/content
+++ b/etc/upgrade/3.3.4/content
@@ -17,7 +17,7 @@ our @Initial = (
         $queues->UnLimit;
         while ( my $queue = $queues->Next ) {
             my $constituency = $queue->FirstCustomFieldValue('RTIR Constituency');
-            if ( $constituency || $queue->Name =~ /^(?:Incidents|Incident Reports|Investigations|Blocks)$/ ) {
+            if ( $constituency || $queue->Name =~ /^(?:Incidents|Incident Reports|Investigations|Countermeasures)$/ ) {
                 my $group = $groups{$constituency || ''};
                 if ( $group && !$group->PrincipalObj->HasRight( Right  => 'ForwardMessage', Object => $queue ) ) {
                     my ( $ret, $msg ) = $group->PrincipalObj->GrantRight(

-----------------------------------------------------------------------