[Rt-commit] [rtir] 12/19: Refactoring to remove duplicated code

[Jesse Vincent]

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

jesse pushed a commit to branch 3.4/remove_old_constituencies
in repository rtir.

commit 943f2fc0296990faa57f2ad265b72832d3622d1d
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Mar 24 20:09:39 2015 -0700

    Refactoring to remove duplicated code
---
 html/RTIR/Incident/Create.html | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/html/RTIR/Incident/Create.html b/html/RTIR/Incident/Create.html
index 264169b..314f0b2 100644
--- a/html/RTIR/Incident/Create.html
+++ b/html/RTIR/Incident/Create.html
@@ -314,31 +314,22 @@ $m->callback(
 );
 
 
-
 my $constituency = $m->{'RTIR_ConstituencyFilter'};
 
 
-if($ChildObj) {
-    my $child_constituency = RT::IR->ConstituencyFor($ChildObj);
-    if ($constituency && $constituency ne $child_constituency) {
-        push @results, loc("[_1] constituency '[_2]' does not match current constituency '[_3]'", RT::IR::TicketType(Ticket=>$ChildObj), $child_constituency, $constituency);
-    } elsif(!$constituency) {
-        $constituency = $child_constituency;
-    }
-}
-
+for my $related_ticket ($ChildObj, $SplitObj) {
+    next if !$related_ticket;
 
-if ($SplitObj) {
-    my $split_constituency = RT::IR->ConstituencyFor($SplitObj);
-    if ($constituency && $constituency ne $split_constituency) {
-        push @results, loc("[_1] constituency '[_2]' does not match current constituency '[_3]'", RT::IR::TicketType(Ticket=>$SplitObj), $split_constituency, $constituency);
+    my $related_constituency = RT::IR->ConstituencyFor($related_ticket);
+    if ($constituency && $constituency ne $related_constituency) {
+        push @results, loc("[_1] constituency '[_2]' does not match current constituency '[_3]'", RT::IR::TicketType(Ticket=>$related_ticket), $related_constituency, $constituency);
     } elsif(!$constituency) {
-        $constituency = $split_constituency;
-    }
+        $constituency = $related_constituency;
+        }
+        last;
 }
 
 
-
 my $QueueObj = RT::Queue->new( $session{'CurrentUser'} );
 $QueueObj->Load( 'Incidents' ) || Abort( loc("Queue could not be loaded.") );
 

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