Merge branch '4.2/graphviz-link-depth' into 4.2-trunk

501c6be3 · Alex Vandiver · e1fbb34a · 785fba4c · 501c6be3
Commit 501c6be3 authored Sep 04, 2014 by Alex Vandiver
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

lib/RT/Graph/Tickets.pm lib/RT/Graph/Tickets.pm +6 -3

No files found.
--- a/lib/RT/Graph/Tickets.pm
+++ b/lib/RT/Graph/Tickets.pm
@@ -299,9 +299,12 @@ sub TicketLinks {
    }

    $args{'Seen'} ||= {};
-    return $args{'Graph'} if $args{'Seen'}{ $args{'Ticket'}->id }++;
-
-    $self->AddTicket( %args );
+    if ( $args{'Seen'}{ $args{'Ticket'}->id } && $args{'Seen'}{ $args{'Ticket'}->id } <= $args{'CurrentDepth'} ) {
+      return $args{'Graph'};
+    } elsif ( ! defined $args{'Seen'}{ $args{'Ticket'}->id } ) {
+      $self->AddTicket( %args );
+    }
+    $args{'Seen'}{ $args{'Ticket'}->id } = $args{'CurrentDepth'};

    return $args{'Graph'} if $args{'MaxDepth'} && $args{'CurrentDepth'} >= $args{'MaxDepth'};