[Rt-commit] [rtir] 01/01: Merge branch '3.0-trunk'

[Kevin Falcone]

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

falcone pushed a commit to branch master
in repository rtir.

commit 4573b7ad2b5966ff492a1363b1d218a684a1bbdb
Merge: b63c24d b262326
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Jul 18 17:17:30 2014 -0400

    Merge branch '3.0-trunk'
    
    Conflicts:
    	lib/RT/IR.pm

 lib/RT/IR.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --cc lib/RT/IR.pm
index 85e14c8,3893c87..5ec8ffa
--- a/lib/RT/IR.pm
+++ b/lib/RT/IR.pm
@@@ -824,25 -759,24 +824,26 @@@ if ( RT::IR->HasConstituency ) 
      sub GetQueueAttribute {
          my $queue = shift;
          my $attr  = shift;
 -        if ( ( my $id = $queue->{'_for_ticket'} ) ) {
 -            my $const = $RT::IR::ConstituencyCache{$id};
 -            if (!$const || $const eq '_none' ) {
 -                my $ticket = RT::Ticket->new(RT->SystemUser);
 -                $ticket->Load($id);
 -                $const = $RT::IR::ConstituencyCache{$ticket->id}
 -                    = $ticket->FirstCustomFieldValue('Constituency') || '_none';
 -            }
 -            if ($const ne '_none' && !$RT::IR::HasNoQueueCache{$const} ) {
 -                my $new_queue = RT::Queue->new(RT->SystemUser);
 -                $new_queue->LoadByCols(
 -                    Name => $queue->Name . " - " . $const );
 -                if ( $new_queue->id && !$new_queue->Disabled ) {
 -                    my $val = $new_queue->_Value($attr) || $queue->_Value($attr);
 -                    RT->Logger->debug("Overriden $attr is $val for ticket #$id according to constituency $const");
 -                    return $val;
 -                } else {
 -                    $RT::IR::HasNoQueueCache{$const} = 1;
++
 +        if ( RT::IR->OurQueue($queue) ) {
 +            if ( ( my $id = $queue->{'_for_ticket'} ) ) {
 +                my $const = $RT::IR::ConstituencyCache{$id};
 +                if (!$const || $const eq '_none' ) {
 +                    my $ticket = RT::Ticket->new(RT->SystemUser);
 +                    $ticket->Load($id);
 +                    $const = $RT::IR::ConstituencyCache{$ticket->id}
 +                        = $ticket->FirstCustomFieldValue('Constituency') || '_none';
 +                }
 +                if ($const ne '_none' && !$RT::IR::HasNoQueueCache{$const} ) {
 +                    my $new_queue = RT::Queue->new(RT->SystemUser);
 +                    $new_queue->LoadByCols( Name => $queue->Name . " - " . $const );
-                     if ( $new_queue->id ) {
++                    if ( $new_queue->id && !$new_queue->Disabled ) {
 +                        my $val = $new_queue->_Value($attr) || $queue->_Value($attr);
 +                        RT->Logger->debug("Overriden $attr is $val for ticket #$id according to constituency $const");
 +                        return $val;
 +                    } else {
 +                        $RT::IR::HasNoQueueCache{$const} = 1;
 +                    }
                  }
              }
          }

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