[Rt-commit] r15775 - rt/3.8/trunk/lib/RT/Report

[ruz at bestpractical.com]

Author: ruz
Date: Thu Sep  4 22:29:09 2008
New Revision: 15775

Modified:
   rt/3.8/trunk/lib/RT/Report/Tickets.pm

Log:
* fix groupping charts by watchers, requestors, cc...

Modified: rt/3.8/trunk/lib/RT/Report/Tickets.pm
==============================================================================
--- rt/3.8/trunk/lib/RT/Report/Tickets.pm	(original)
+++ rt/3.8/trunk/lib/RT/Report/Tickets.pm	Thu Sep  4 22:29:09 2008
@@ -200,9 +200,14 @@
             @args{qw(ALIAS FIELD)} = ($ticket_cf_alias, 'Content');
         }
     } elsif ( $field =~ /^(?:Watcher|(Requestor|Cc|AdminCc))$/ ) {
-        my $type = $1;
-        my ($g_alias, $gm_alias, $u_alias) = $self->_WatcherJoin( $type );
-        @args{qw(ALIAS FIELD)} = ($u_alias, 'Name');
+        my $type = $1 || '';
+        if ( my $u_alias = $self->{"_sql_report_watcher_users_alias_$type"} ) {
+            @args{qw(ALIAS FIELD)} = ($u_alias, 'Name');
+        } else {
+            my ($g_alias, $gm_alias, $u_alias) = $self->_WatcherJoin( $type );
+            @args{qw(ALIAS FIELD)} = ($u_alias, 'Name');
+            $self->{"_sql_report_watcher_users_alias_$type"} = $u_alias;
+        }
     }
     return %args;
 }