[Rt-commit] [rtir] 02/10: Rename SelectedBlocks to SelectedCountermeasures

[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 287b968756f44ea3176b075827770c27db156200
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Wed Feb 24 23:48:05 2016 +0000

    Rename SelectedBlocks to SelectedCountermeasures
---
 etc/RTIR_Config.pm                           |  6 +++---
 html/Callbacks/RTIR/Elements/Tabs/Privileged |  2 +-
 html/RTIR/Incident/Reply/Refine.html         |  4 ++--
 html/RTIR/Incident/Reply/index.html          | 12 ++++++------
 t/searches/menu.t                            |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/etc/RTIR_Config.pm b/etc/RTIR_Config.pm
index 1136164..2eae48a 100644
--- a/etc/RTIR_Config.pm
+++ b/etc/RTIR_Config.pm
@@ -62,7 +62,7 @@ Set(
             'open -> resolved'  => {
                 label => 'Resolve', update => 'Comment',
                 All => 1,
-                SelectedReportsAll => 1, SelectedInvestigationsAll => 1, SelectedBlocksAll => 1,
+                SelectedReportsAll => 1, SelectedInvestigationsAll => 1, SelectedCountermeasuresAll => 1,
             },
             'open -> resolved'  => {
                 label => 'Quick Resolve',
@@ -70,12 +70,12 @@ Set(
             'open -> abandoned' => {
                 label => 'Abandon', update => 'Comment',
                 All => 1,
-                SelectedReportsAll => 1, SelectedInvestigationsAll => 1, SelectedBlocksAll => 1,
+                SelectedReportsAll => 1, SelectedInvestigationsAll => 1, SelectedCountermeasuresAll => 1,
             },
             '* -> open'  => {
                 label => 'Re-open',
                 All => 1,
-                SelectedReportsAll => 1, SelectedInvestigationsAll => 1, SelectedBlocksAll => 1,
+                SelectedReportsAll => 1, SelectedInvestigationsAll => 1, SelectedCountermeasuresAll => 1,
             },
         ],
     },
diff --git a/html/Callbacks/RTIR/Elements/Tabs/Privileged b/html/Callbacks/RTIR/Elements/Tabs/Privileged
index 8280831..94ad101 100644
--- a/html/Callbacks/RTIR/Elements/Tabs/Privileged
+++ b/html/Callbacks/RTIR/Elements/Tabs/Privileged
@@ -242,7 +242,7 @@ if ( $request_path =~ m{(?:$re_rtir_path)(?:$re_rtir_types/)?(Display|Edit|Updat
             );
             $actions_tab->child(
                 reply_all => title => loc('Reply to All'),
-                path  => RT::IR->HREFTo("Incident/Reply/?id=$id&All=1&SelectedReportsAll=1&SelectedInvestigationsAll=1&SelectedBlocksAll=1", IncludeWebPath => 0),
+                path  => RT::IR->HREFTo("Incident/Reply/?id=$id&All=1&SelectedReportsAll=1&SelectedInvestigationsAll=1&SelectedCountermeasuresAll=1", IncludeWebPath => 0),
             );
         } else {
             $actions_tab->child(
diff --git a/html/RTIR/Incident/Reply/Refine.html b/html/RTIR/Incident/Reply/Refine.html
index e98d120..0c458dd 100644
--- a/html/RTIR/Incident/Reply/Refine.html
+++ b/html/RTIR/Incident/Reply/Refine.html
@@ -58,14 +58,14 @@ return $m->comp(
         Status => $ARGS{'Status'}, Action => $ARGS{'Action'},
         SelectedReportsAll => $ARGS{'SelectedReportsAll'},
         SelectedInvestigationsAll => $ARGS{'SelectedInvestigationsAll'},
-        SelectedBlocksAll => $ARGS{'SelectedBlocksAll'},
+        SelectedCountermeasuresAll => $ARGS{'SelectedCountermeasuresAll'},
     ),
     BaseQuery => RT::IR->Query(
     Lifecycle    => \@lifecycles,
         MemberOf => $ARGS{'id'},
     ),
     ExtraQueryParams => [qw(SelectedReportsAll SelectedInvestigationsAll
-                            All Status Action SelectedBlocksAll)],
+                            All Status Action SelectedCountermeasuresAll)],
 
 );
 </%INIT>
diff --git a/html/RTIR/Incident/Reply/index.html b/html/RTIR/Incident/Reply/index.html
index c7cabd1..af037d1 100644
--- a/html/RTIR/Incident/Reply/index.html
+++ b/html/RTIR/Incident/Reply/index.html
@@ -97,7 +97,7 @@
     BaseURL       => $BaseURL,
     BaseQuery     => RT::IR->Query(Lifecycle => RT::IR->lifecycle_countermeasure, MemberOf => $id),
     Query         => $Query,
-    DisplayFormat => "__CheckBox.{SelectedBlocks}__, $Format",
+    DisplayFormat => "__CheckBox.{SelectedCountermeasures}__, $Format",
     Format        => $Format,
     Rows          => $Rows,
     Page          => $Page,
@@ -149,7 +149,7 @@ $m->comp( '/Elements/Crypt/SignEncryptWidget:Process',
 );
 
 my @selected_children;
-foreach my $id( @SelectedReports, @SelectedInvestigations, @SelectedBlocks ) {
+foreach my $id( @SelectedReports, @SelectedInvestigations, @SelectedCountermeasures ) {
     my $ticket = RT::Ticket->new( $session{'CurrentUser'} );
     $ticket->Load( $id );
     unless( $ticket->id ) {
@@ -271,8 +271,8 @@ $Page            => 1
 $OrderBy         => RT->Config->Get('DefaultSearchResultOrderBy')
 $Order           => RT->Config->Get('DefaultSearchResultOrder')
 
- at SelectedReports        => ()
- at SelectedInvestigations => ()
- at SelectedBlocks         => ()
-$SubmitTicket           => 0
+ at SelectedReports         => ()
+ at SelectedInvestigations  => ()
+ at SelectedCountermeasures => ()
+$SubmitTicket            => 0
 </%ARGS>
diff --git a/t/searches/menu.t b/t/searches/menu.t
index b5c3177..b2e0ef3 100644
--- a/t/searches/menu.t
+++ b/t/searches/menu.t
@@ -199,7 +199,7 @@ for my $type ( 'incident', 'ir', 'investigation', 'block' ) {
     ($checkbox) = $m->find_all_inputs( name => 'SelectedInvestigations' );
     is( $checkbox->value, $ticket{investigation}[0], '$ticket{investigation}[0] is checked' );
 
-    ($checkbox) = $m->find_all_inputs( name => 'SelectedBlocks' );
+    ($checkbox) = $m->find_all_inputs( name => 'SelectedCountermeasures' );
     is( $checkbox->value, $ticket{block}[0], '$ticket{block}[0] is checked' );
 
     $m->follow_link_ok( { text => "Edit Search", n => 2 } );

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