[Rt-commit] [rtir] 01/01: Merge branch '2.9/grant-dutyteam-showoutgoingemail' into 2.9-trunk

[Kevin Falcone]

This is an automated email from the git hooks/post-receive script.

falcone pushed a commit to branch 2.9-trunk
in repository rtir.

commit 39e3b9239af3cd00869f0c2653cab39c02d190cc
Merge: 57e5498 edd2478
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Jun 7 13:56:57 2013 -0400

    Merge branch '2.9/grant-dutyteam-showoutgoingemail' into 2.9-trunk
    
    Conflicts:
    	etc/upgrade/3.0.0rc2/content

 etc/initialdata              |  4 ++++
 etc/upgrade/3.0.0rc2/content | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --cc etc/upgrade/3.0.0rc2/content
index 573aa4d,09c4a83..b202671
--- a/etc/upgrade/3.0.0rc2/content
+++ b/etc/upgrade/3.0.0rc2/content
@@@ -1,25 -1,24 +1,44 @@@
  use strict;
  use warnings;
 -
+ my @OUR_QUEUES = ('Incidents', 'Incident Reports', 'Investigations', 'Blocks');
+ 
+ our @Initial = (
+     sub {
+         return 1 if grep $_ eq 'RT::IR', RT->Config->Get('Plugins');
+ 
+         die "Please enable RT::IR plugin in the config file.\n";
+     },
+ );
+ 
+ our @ACL;
+ foreach my $queue (@OUR_QUEUES) {
+     push @ACL, (
+     { GroupId => 'DutyTeam',
+       GroupDomain => 'UserDefined',
+       Queue => $queue,
+       Right  => 'ShowOutgoingEmail', },
+  );
+ }
  
 +our @Final = (
 +
 +    sub {
 +        $RT::Logger->debug("Going to make IP custom fields link to Lookup");
 +        my $ip_cf = RT::CustomField->new(RT->SystemUser);
 +        my ($ok, $msg) = $ip_cf->Load('IP');
 +        if ( $ip_cf->Id ) {
 +            if ( $ip_cf->LinkValueTo ){
 +                $RT::Logger->warning("IP custom field link value already set, skipping");
 +            }
 +            else{
 +                $ip_cf->SetLinkValueTo('__WebPath__/RTIR/Tools/Lookup.html?type=ip&q=__CustomField__&ticket=__id__');
 +            }
 +        }
 +        else{
 +            $RT::Logger->error("IP custom field not found: $msg");
 +        }
 +    },
 +
 +);
 +
  1;

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