[Rt-commit] rtir branch, 3.4/countermeasures, updated. 3.3.0-99-geff3889

[Shawn Moore]

The branch, 3.4/countermeasures has been updated
       via  eff388935c7669af7c494e3a572c23fef85104c1 (commit)
       via  9f0254f9fd5c8077b312a065e16ad22d18a992ef (commit)
      from  208ce1eef8a4f4cc5798ca6747101992c9ac3448 (commit)

Summary of changes:
 docs/UPGRADING-3.4        | 26 ++++++++++++++++++++++++++
 etc/upgrade/3.3.0/content | 28 +++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit 9f0254f9fd5c8077b312a065e16ad22d18a992ef
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Fri May 20 14:50:01 2016 -0400

    UPGRADING-3.4 doc for Countermeasures

diff --git a/docs/UPGRADING-3.4 b/docs/UPGRADING-3.4
index fa8a14d..793298e 100644
--- a/docs/UPGRADING-3.4
+++ b/docs/UPGRADING-3.4
@@ -21,6 +21,32 @@ lifecycle to determine what kind of queue it is, rather than its
 name. This functionality is very much in its infancy and we welcome
 your feedback.
 
+=head2 Countermeasures
+
+The Blocks queue was renamed to Countermeasures to indicate it is more
+generic than just network blocks. The normal RTIR upgrade process
+handles most of the renaming process, but you may need to adjust some of
+your configuration and customizations.
+
+The "blocks" lifecycle has been renamed to "countermeasures". If you
+copied the RTIR lifecycle config, regardless of whether you customized
+it, you'll need to rename the "blocks" lifecycle to "countermeasures" in
+your config.
+
+If you use RT_Config option RTIR_DisableBlocksQueue, please update your
+config to instead set that option by its new name:
+RTIR_DisableCountermeasures.
+
+Similarly if you use RT_Config option RTIR_BlockAproveActionRegexp,
+please update its name to RTIR_CountermeasureApproveActionRegexp (beware
+the typo fix in the word "Approve").
+
+If you set the RTIR_IncidentChildren config option, you'll need to
+adjust the key "Block" to "Countermeasure" (note: not "Countermeasures").
+
+If you have any custom code that deals with Blocks queues by name,
+you'll need to update it.
+
 =head2 Constituency support
 
 =head3 Web interface

commit eff388935c7669af7c494e3a572c23fef85104c1
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Fri May 20 15:01:55 2016 -0400

    Fix scrips and templates that use blocks

diff --git a/etc/upgrade/3.3.0/content b/etc/upgrade/3.3.0/content
index c78291a..ac814af 100644
--- a/etc/upgrade/3.3.0/content
+++ b/etc/upgrade/3.3.0/content
@@ -12,7 +12,7 @@ our @Final = (
             }
         }
 
-        # fix queue name from Blocks to Countermeasures
+        # fix queue names from Blocks to Countermeasures
         {
             my $queues = RT::Queues->new(RT->SystemUser);
             $queues->Limit(
@@ -31,6 +31,32 @@ our @Final = (
                 $queue->SetName($new);
             }
         }
+
+        # fix RTIR Set Block Status action
+        {
+            my $action = RT::ScripAction->new(RT->SystemUser);
+            $action->Load('RTIR Set Block Status');
+            $action->Set(Field => 'Name', Value => 'RTIR Set Countermeasure Status');
+            $action->Set(Field => 'ExecModule', Value => 'RTIR_SetCountermeasureStatus');
+        }
+
+        # fix BlockRemoved templates
+        {
+            my $templates = RT::Templates->new(RT->SystemUser);
+            $templates->Limit(FIELD => 'Name', Value => 'BlockRemoved');
+            while (my $template = $templates->Next) {
+                $template->SetName('CountermeasureRemoved');
+            }
+        }
+
+        # fix scrips that use BlockRemoved
+        {
+            my $scrips = RT::Scrips->new(RT->SystemUser);
+            $scrips->Limit(FIELD => 'Template', Value => 'BlockRemoved');
+            while (my $scrip = $scrips->Next) {
+                $scrip->SetTemplate('CountermeasureRemoved');
+            }
+        }
     },
 );
 

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