[Rt-commit] rtir branch, master, updated. 3.3.0-134-g281160e

Dustin Graves dustin at bestpractical.com
Wed May 25 16:17:38 EDT 2016


The branch, master has been updated
       via  281160e21933cf52b2e9e592826754a5df7f2b5c (commit)
       via  58773ee64b6dba315687fe46db1df579ad8eb904 (commit)
       via  9f0254f9fd5c8077b312a065e16ad22d18a992ef (commit)
       via  208ce1eef8a4f4cc5798ca6747101992c9ac3448 (commit)
       via  39c6332cff290d0b4b6f46deb5aff18e767cb863 (commit)
       via  73e6e5d90dc121adc81dbb9bd0b2b23b89944508 (commit)
       via  6fb2227dc527e51f461acab03d02ff4d3a809988 (commit)
       via  154238bd0c37b743dd48f0ff64647ed45c2ffc67 (commit)
       via  34f7966e171c9bd9cde1e6c2604fb71c7ac41887 (commit)
       via  f888baa471501c37892389f62ed920ed62bb7ab6 (commit)
       via  09c99042ad6c9f8503fdca76d8a1ed85fcc349f9 (commit)
       via  6cdb8d043e668b31e34dc5ca468cf48a9a1b9926 (commit)
       via  ab2b15e5bbd31f0c2cd1c54a54937bb7e7831322 (commit)
       via  78b96a11be5ec62198e9c664cd99c0e8d90f3408 (commit)
       via  575bc451e65b40f2e64be65a03994e57f9d46c47 (commit)
       via  cbad0541187aecd85635df0eae24d05cf0dbebc1 (commit)
       via  0ac4c7a60349bffae83e3fd299f374f1377036cb (commit)
       via  f108563c5cf1f650627511943f1bc00ae03aab42 (commit)
       via  bb8fa78f17b482b96cbd16f1ebf0cf38db03fd22 (commit)
       via  ce554cf0c4965fad99ae741474c08cf95b55f5dd (commit)
       via  fdc75b4eb5f49c12da28d30b53b7a9c714759e58 (commit)
       via  87b40a0a382841d1de2674a4e8b22eaaf9e31f3f (commit)
       via  835c5399cce44c94b3084ac6e0cc708cc005e663 (commit)
       via  a512a216db42a29665ff8e7b0833bcb2f40daef9 (commit)
       via  60d0745465dfb635f45e12af67dd67f90693dd4a (commit)
       via  d1478c85ac83d50803473faa68a10e8901d54388 (commit)
       via  f09061f32d5fa5a3bdbc067f06d98c5b1db168c9 (commit)
       via  2b52712f0987fb5c940ae15326d6fcae62cc29b0 (commit)
       via  a35a8855302ccbab9daac64881fb4d7151d01a0f (commit)
       via  1073c9b17b9f11a5db9c728f6e1bf7407754e5eb (commit)
       via  b97f1655e22754537237a798d2852a248b926e68 (commit)
       via  287b968756f44ea3176b075827770c27db156200 (commit)
       via  af6e5ae6e4f9f33ceb524c9ade62aee548b931fd (commit)
       via  99ef2bfd513c27636b9cf48f96b5d103be49d866 (commit)
       via  8c7de771408b6389da48a020b97cfbe5c865bbe8 (commit)
       via  36b5bc5dc05bf316231f0478607f7e535c954dae (commit)
       via  383bb5e601f73b028db2e1a8ec355e47ec1fb5e8 (commit)
       via  43b776beeb250db0251bfbb6d17a7e462e030b87 (commit)
       via  af89baa5174d6a45a1a7f94753d302098c6545aa (commit)
      from  964fac84b93386e141144ba78cb37a6e749cbb57 (commit)

Summary of changes:
 MANIFEST                                           |  10 +-
 README                                             |   7 +-
 bin/add_constituency.in                            |  40 ++--
 docs/AdministrationTutorial.pod                    |  63 +++---
 docs/Constituencies.pod                            |   8 +-
 docs/DocIndex.pod                                  |  26 +--
 docs/Tutorial.pod                                  |  60 +++---
 docs/UPGRADING-3.4                                 |  26 +++
 etc/RTIR_Config.pm                                 |  52 ++---
 etc/initialdata                                    |  56 +++---
 etc/upgrade/3.3.0/content                          | 219 +++++----------------
 etc/upgrade/{3.3.4 => 3.3.1}/content               |   2 +-
 etc/upgrade/3.3.2/content                          | 217 +++++++++++++++++---
 etc/upgrade/3.3.3/content                          |  51 ++---
 etc/upgrade/3.3.4/content                          |  55 +++---
 html/Callbacks/RTIR/Elements/MakeClicky/Default    |   2 +-
 html/Callbacks/RTIR/Elements/Tabs/Privileged       |   6 +-
 html/RTIR/Create.html                              |   4 +-
 html/RTIR/Display.html                             |   4 +-
 html/RTIR/Edit.html                                |   4 +-
 html/RTIR/Incident/Display.html                    |   2 +-
 html/RTIR/Incident/Elements/ShowChildren           |   2 +-
 html/RTIR/Incident/Reply/Refine.html               |   6 +-
 html/RTIR/Incident/Reply/index.html                |  18 +-
 html/RTIR/Tools/Elements/LookupRelatedTickets      |   2 +-
 html/RTIR/Tools/Elements/LookupSummary             |   2 +-
 lib/RT/Action/RTIR_ChangeChildOwnership.pm         |   2 +-
 lib/RT/Action/RTIR_ResolveChildren.pm              |   2 +-
 ...ckStatus.pm => RTIR_SetCountermeasureStatus.pm} |  12 +-
 lib/RT/IR.pm                                       |  30 +--
 lib/RT/IR/Test/Web.pm                              |   8 +-
 static/css/rtir-styles.css                         |   2 +-
 t/009-attachments-processing.t                     |   2 +-
 t/articles/on-create.t                             |   2 +-
 t/articles/on-update.t                             |   4 +-
 t/{block => countermeasure}/pending-no-regexp.t    |   8 +-
 t/{block => countermeasure}/pending-regexp.t       |  12 +-
 t/{block => countermeasure}/status-basics.t        |   6 +-
 .../status-editor-regression.t                     |   4 +-
 t/custom-fields/defaults-config.t                  |  10 +-
 t/custom-fields/defaults-on-linking.t              |   2 +-
 t/custom-fields/ip.t                               |  30 +--
 t/custom-fields/ipv6.t                             |  30 +--
 t/custom-fields/on-transactions.t                  |   6 +-
 t/dates/started.t                                  |   2 +-
 t/searches/menu.t                                  |  16 +-
 t/walk-web.t                                       |   2 +-
 47 files changed, 603 insertions(+), 533 deletions(-)
 copy etc/upgrade/{3.3.4 => 3.3.1}/content (96%)
 rename lib/RT/Action/{RTIR_SetBlockStatus.pm => RTIR_SetCountermeasureStatus.pm} (89%)
 rename t/{block => countermeasure}/pending-no-regexp.t (90%)
 rename t/{block => countermeasure}/pending-regexp.t (90%)
 rename t/{block => countermeasure}/status-basics.t (92%)
 rename t/{block => countermeasure}/status-editor-regression.t (77%)

- Log -----------------------------------------------------------------
commit 281160e21933cf52b2e9e592826754a5df7f2b5c
Merge: 964fac8 58773ee
Author: Dustin Graves <dustin at bestpractical.com>
Date:   Wed May 25 19:18:47 2016 +0000

    Merge branch '3.4/countermeasures'
    
    Conflicts:
    	README
    	docs/AdministrationTutorial.pod
    	static/css/rtir-styles.css
    	t/constituency/basics.t
    	t/constituency/email.t
    	t/constituency/propagation-inherit.t
    	t/constituency/propagation-no.t
    	t/constituency/propagation-reject.t

diff --cc README
index accf199,630af89..5c289e4
--- a/README
+++ b/README
@@@ -63,11 -69,12 +63,12 @@@ Configuring RTI
  
  1) Using RT's configuration interface, add the email address
     of the Network Operations Team (the people who will handle
-    activating and removing Blocks) as AdminCc on the Blocks queue.
-    RT -> Queues -> Blocks -> Watchers
 -   activating and removing network blocks) as AdminCC on the
++   activating and removing network blocks) as AdminCc on the
+    Countermeasures queue.
+    RT -> Queues -> Countermeasures -> Watchers
  
  2) You may want to modify the email messages that are automatically
-    sent on the creation of Investigations and Blocks.
+    sent on the creation of Investigations and Countermeasures.
     RT -> Queues -> <Select RTIR's Queue> -> Templates.
     RT -> Global -> Templates.
  
diff --cc bin/add_constituency.in
index bbcf80f,ec71307..9f4ab2b
--- a/bin/add_constituency.in
+++ b/bin/add_constituency.in
@@@ -426,19 -388,42 +424,19 @@@ sub grant_group_cf_rights 
      my @rights = (@_);
  
      my $cfs = RT::CustomFields->new($RT::SystemUser);
-     for my $queue (@queue_prefixes) {
-         my $q = load_queue($queue);
+     for my $lifecycle (@lifecycles) {
+         my $q = base_queue_for_lifecycle($lifecycle);
          $cfs->LimitToObjectId( $q->Id );
      }
 -    while ( my $cf = $cfs->Next ) {
 -        debug "Granting rights for custom field "
 -            . $cf->Name
 -            . " to group "
 -            . $group->Name . "\n";
  
 -        foreach my $right (@rights) {
 -            debug "\t$right";
 -            if ($group->PrincipalObj->HasRight(
 -                    Right  => $right,
 -                    Object => $cf
 -                )
 -               )
 -            {
 -                debug "\t...skipped, already granted\n";
 -                next;
 -            }
 -            my ( $val, $msg ) = $group->PrincipalObj->GrantRight(
 -                Right  => $right,
 -                Object => $cf
 -            );
 -            if ($val) {
 -                debug "\t...done.\n";
 -            } else {
 -                die "Failed to grant $right to "
 -                    . $group->Name
 -                    . " for Custom Field "
 -                    . $cf->Name
 -                    . ".\nError: $msg";
 -            }
 -        }
 +    while ( my $cf = $cfs->Next ) {
 +        grant_group_single_cf_rights( $cf, $group, \@rights );
      }
 +
 +    # explicitly grant rights on 'RTIR Constituency' cf as well
 +    my $rtir_constituency_cf = get_constituency_cf();
 +    grant_group_single_cf_rights( $rtir_constituency_cf, $group, \@rights );
 +
      return 1;
  }
  
diff --cc docs/AdministrationTutorial.pod
index f7f3d47,74e874b..8e54bb0
--- a/docs/AdministrationTutorial.pod
+++ b/docs/AdministrationTutorial.pod
@@@ -17,21 -17,21 +17,21 @@@ To change a configuration value, copy t
  or F<RTIR_Config.pm> and add it to the relevant Site Config. Then set
  your custom configuration values there.
  
- =head2 Blocks Feature
 -=head2 Countermeasures Queue
++=head2 Countermeasures Feature
  
- You may disable Blocks feature by putting the following into your
 -You may disable the Countermeasures queue by putting the following into your
++You may disable the Countermeasures feature 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 any Blocks queues using the RT
 -You will probably also want to disable the Queue using the RT
 -Administrative interface.  Tools -> Configuration -> Queues -> Countermeasures,
++You will probably also want to disable any Countermeasures queues using the RT
 +Administrative interface.  Tools -> Configuration -> Queues -> (select one),
  uncheck Enabled and click Save Changes.
  
  =head2 Status
  
- The various states an incident, incident report, investigation, or block can be
- in, such as 'open', 'stalled', 'abandoned', etc.
 -The various states an incident, IR, investigation, or countermeasure can be in,
 -such as 'open', 'stalled', 'abandoned', etc.
++The various states an incident, incident report, investigation, or
++countermeasure can be in, such as 'open', 'stalled', 'abandoned', etc.
  
  This field contains custom statuses for tickets, and values are different in
  different queues. The status values are set via the C<%Lifecycles> option in
@@@ -115,7 -98,7 +115,7 @@@ See also L</SetIPFromContent> below
  
  =item Netmask
  
- Network mask for a Block.
 -Network mask for a block countermeasure.
++Network mask for a network block.
  
  =item Port
  
@@@ -238,27 -221,31 +238,28 @@@ not copied down to Children)
  
  =item ResolveAllChildren
  
 -Applies to the Incidents queue.
 +Applies to Incidents.
  
- If an incident is changed to an inactive status,
- looks for linked tickets in Incident Reports, Investigations or Blocks
- queues and resolves them.  If any of these linked tickets are linked
- to other ongoing incidents, a comment is added and they remain unresolved.
+ If an incident is changed to an inactive status, looks for linked tickets in
 -the Incident Reports, Investigations or Countermeasures queues and resolves
 -them.  If any of these linked tickets are linked to other ongoing incidents, a
 -comment is added and they remain unresolved.
++Incident Reports, Investigations or Countermeasures queues and resolves them.
++If any of these linked tickets are linked to other ongoing incidents, a comment
++is added and they remain unresolved.
  
  =item FixOwnership
  
 -Applies to the Incidents queue.
 +For Incidents: When the Owner of an incident is changed, the Owner of linked
 +children tickets are changed to the same owner.
  
- For Incident Reports, Blocks and Investigations: When the Owner of a ticket in
- such queues is changed, that change is also applied to the linked Incident.
 -When the Owner of an incident is changed, the Owner of linked children
 -tickets are changed to the same owner.
 -
 -Applies to the Incident Reports, Countermeasures and Investigations queues.
 -
 -When the Owner of a ticket in these queues is changed, that change
 -is also applied to the linked incident.
++For Incident Reports, Countermeasures and Investigations: When the Owner of a
++ticket in such queues is changed, that change is also applied to the linked
++Incident.
  
  =item ReopenIncident
  
- Applies to Incident Reports, Blocks and Investigations.
 -Applies to the Incident Reports, Countermeasures and Investigations queues.
++Applies to Incident Reports, Countermeasures and Investigations.
  
 -If the status of a ticket in these queues is changed from rejected or
 -resolved, the linked parent incident ticket status is set to open.
 +If the status of a ticket in such queues is changed from rejected or
 +resolved, the linked parent Incident ticket status is set to open.
  
  =item SetDefaultIncidentResolution
  
@@@ -273,15 -260,16 +274,15 @@@ F<RTIR_Config.pm>
  
  =item NotifyOnClose
  
- Applies to Blocks.
 -Applies to the Countermeasures queue.
++Applies to Countermeasures.
  
- When a block ticket is moved from an active status to an inactive
- status (closed), the requestors on the block are notified using the
- L<Templates/BlockRemoved in Blocks queue> template.
+ When a countermeasure ticket is moved from an active status to an inactive
+ status (closed), the requestors on the countermeasure are notified using the
+ L<Templates/CountermeasureRemoved in Countermeasure queue> template.
  
  =item SetIPFromContent
  
- Applies to Incident Reports, Blocks, Incidents and Investigations.
 -Applies to the Incident Reports, Countermeasures, Incidents and Investigations
 -queues.
++Applies to Incident Reports, Countermeasures, Incidents and Investigations.
  
  Updates the ticket custom field IP to have a list of all IPs and IP ranges
  found in the body of the ticket during Create and Correspond.
diff --cc static/css/rtir-styles.css
index 1100541,7e28e81..4edbd4e
--- a/static/css/rtir-styles.css
+++ b/static/css/rtir-styles.css
@@@ -73,11 -68,11 +73,11 @@@ body.rtir #topactions { min-width: 44em
      width: 80%;
  }
  
 -body.rtir .titlebox.ticket-info-articles            .titlebox-title .left { background-color: #316531; color: #fff; }
 -body.rtir .titlebox.tickets-list-report             .titlebox-title .left { background-color: #316531; color: #fff; }
 -body.rtir .titlebox.tickets-list-incident           .titlebox-title .left { background-color: #316531; color: #fff; }
 -body.rtir .titlebox.tickets-list-investigation      .titlebox-title .left { background-color: #316531; color: #fff; }
 -body.rtir .titlebox.tickets-list-countermeasure     .titlebox-title .left { background-color: #316531; color: #fff; }
 +body.rtir .titlebox.ticket-info-articles        .titlebox-title .left { background-color: #316531; color: #fff; }
 +body.rtir .titlebox.tickets-list-report         .titlebox-title .left { background-color: #316531; color: #fff; }
 +body.rtir .titlebox.tickets-list-incident       .titlebox-title .left { background-color: #316531; color: #fff; }
 +body.rtir .titlebox.tickets-list-investigation  .titlebox-title .left { background-color: #316531; color: #fff; }
- body.rtir .titlebox.tickets-list-block          .titlebox-title .left { background-color: #316531; color: #fff; }
++body.rtir .titlebox.tickets-list-countermeasure .titlebox-title .left { background-color: #316531; color: #fff; }
  
  
  body.rtir #comp-RTIR-Search #body {

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


More information about the rt-commit mailing list