[Rt-commit] [rtir] 06/07: fix error and warnings in RT::Action::RTIR_ChangeChildConstituencies

[Dustin Graves]

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

dustin pushed a commit to branch 3.4/popup-ticket-create
in repository rtir.

commit 584dfbd87483e2726f5a296f16d241c0b917e4db
Author: Dustin Graves <dustin at bestpractical.com>
Date:   Thu May 12 23:32:33 2016 +0000

    fix error and warnings in RT::Action::RTIR_ChangeChildConstituencies
    
    error occured due to commit 9e9afd6c566 missing a variable declaration
    warnings occured when moving to/from queue with no constituency
---
 lib/RT/Action/RTIR_ChangeChildConstituencies.pm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/RT/Action/RTIR_ChangeChildConstituencies.pm b/lib/RT/Action/RTIR_ChangeChildConstituencies.pm
index 29bb92c..b61f4aa 100644
--- a/lib/RT/Action/RTIR_ChangeChildConstituencies.pm
+++ b/lib/RT/Action/RTIR_ChangeChildConstituencies.pm
@@ -67,10 +67,10 @@ sub Prepare {
     my $q2 = RT::Queue->new(RT->SystemUser);
     $q2->Load($self->TransactionObj->NewValue);
 
-    return 0 unless (RT::IR->ConstituencyFor($q2) ne RT::IR->ConstituencyFor($q1));
+    return 0 unless ((RT::IR->ConstituencyFor($q2)||'') ne (RT::IR->ConstituencyFor($q1)||''));
 
-    $self->{'old_constituency'} = RT::IR->ConstituencyFor($q1);
-    $self->{'new_constituency'} = RT::IR->ConstituencyFor($q2);
+    $self->{'old_constituency'} = RT::IR->ConstituencyFor($q1) || '';
+    $self->{'new_constituency'} = RT::IR->ConstituencyFor($q2) || '';
     return 1;
 }
 
@@ -85,6 +85,7 @@ sub Commit {
     my $self = shift;
 
     my $new_constituency = $self->{'new_constituency'};
+    my $old_constituency = $self->{'old_constituency'};
 
     # find all the tickets related to this ticket
 
@@ -92,7 +93,7 @@ sub Commit {
 
     # for each ticket,
     while ( my $ticket = $kids->Next) {
-        my $kid_constituency = RT::IR->ConstituencyFor($ticket);
+        my $kid_constituency = RT::IR->ConstituencyFor($ticket) || '';
         next if ($kid_constituency eq $new_constituency);
         next if ($kid_constituency ne $old_constituency);
         # if the constituency of the other ticket isn't the same as the new 
@@ -104,12 +105,12 @@ sub Commit {
         my $new_queue = RT::Queue->new(RT->SystemUser);
         $new_queue->Load($kid_queue);
         if (    !$new_queue->id
-             || ( RT::IR->ConstituencyFor($new_queue) ne $new_constituency) 
+             || ( (RT::IR->ConstituencyFor($new_queue)||'') ne $new_constituency)
              || ($new_queue->Lifecycle ne $ticket->QueueObj->Lifecycle)) {
             my $queues = RT::Queues->new(RT->SystemUser);
             $queues->Limit(FIELD => 'Lifecycle', VALUE => $ticket->QueueObj->Lifecycle);
             while (my $temp_queue = $queues->Next) {
-                if (RT::IR->ConstituencyFor($temp_queue) eq $new_constituency) {
+                if ((RT::IR->ConstituencyFor($temp_queue)||'') eq $new_constituency) {
                     $new_queue = $temp_queue;
                     last;
                 }

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