[Rt-commit] rt branch, 3.999-trunk, updated. f131f753b719fe3eb9dc272bf4350bdb917aa594

[sunnavy at bestpractical.com]

The branch, 3.999-trunk has been updated
       via  f131f753b719fe3eb9dc272bf4350bdb917aa594 (commit)
      from  d02175b20084c9b51252d03ea08da334352c10d8 (commit)

Summary of changes:
 lib/RT/Report/Tickets/Entry.pm   |    3 +--
 share/html/Search/Chart          |   12 ++++++------
 share/html/Search/Elements/Chart |   10 ++++++----
 3 files changed, 13 insertions(+), 12 deletions(-)

- Log -----------------------------------------------------------------
commit f131f753b719fe3eb9dc272bf4350bdb917aa594
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Nov 18 11:19:03 2009 +0800

    make search result chart work

diff --git a/lib/RT/Report/Tickets/Entry.pm b/lib/RT/Report/Tickets/Entry.pm
index d2b7166..1466e0f 100644
--- a/lib/RT/Report/Tickets/Entry.pm
+++ b/lib/RT/Report/Tickets/Entry.pm
@@ -46,12 +46,11 @@
 #
 # END BPS TAGGED BLOCK }}}
 package RT::Report::Tickets::Entry;
-use base qw/RT::Record/;
+use base qw/RT::Model::Ticket/;
 
 # XXX TODO: how the heck do we acl a report?
 #
 
-sub table                  {'Tickets'}
 sub current_user_has_right {1}
 
 1;
diff --git a/share/html/Search/Chart b/share/html/Search/Chart
index a16e691..78a7cfc 100644
--- a/share/html/Search/Chart
+++ b/share/html/Search/Chart
@@ -68,9 +68,11 @@ if ($chart_style eq 'pie') {
 
 my $tix = RT::Report::Tickets->new();
 $tix->from_sql( $query );
-my $count_name = $tix->column( FUNCTION => 'COUNT', column => 'id' );
+my $count_name = $tix->column( function => 'COUNT', column => 'id' );
 $tix->group_by( column => $primary_group_by );
 my $value_name = $tix->column( column => $primary_group_by );
+$count_name =~ s/^main_//;
+$value_name =~ s/^main_//;
 
 my $chart = $chart_class->new( 600 => 400 );
 
@@ -116,12 +118,11 @@ if ($chart_class eq "GD::Graph::bars") {
 
 my %class = (
     queue => 'RT::Model::Queue',
-    Owner => 'RT::Model::User',
-    Creator => 'RT::Model::User',
-    LastUpdatedBy => 'RT::Model::User',
+    owner => 'RT::Model::User',
+    creator => 'RT::Model::User',
+    last_updated_by => 'RT::Model::User',
 );
 my $class = $class{ $primary_group_by };
-
 while ( my $entry = $tix->next ) {
     if ( $class ) {
         my $q = $class->new();
@@ -138,7 +139,6 @@ while ( my $entry = $tix->next ) {
     }
     push @values, $entry->__value($count_name);
 }
-
 # XXX: Convert 1970-01-01 date to the 'Not Set'
 # this code should be generalized!!!
 if ( $primary_group_by =~ /(Daily|Monthly|Annually)$/ ) {
diff --git a/share/html/Search/Elements/Chart b/share/html/Search/Elements/Chart
index 2109b95..aeae40c 100644
--- a/share/html/Search/Elements/Chart
+++ b/share/html/Search/Elements/Chart
@@ -57,12 +57,14 @@ $tix->from_sql( $query );
 my $count_name = $tix->column( function => 'COUNT', column => 'id' );
 $tix->group_by( column => $primary_group_by );
 my $value_name = $tix->column( column => $primary_group_by );
-
+# XXX TODO we need a better way
+$value_name =~ s/^main_//;
+$count_name =~ s/^main_//;
 my %class = (
     queue => 'RT::Model::Queue',
-    Owner => 'RT::Model::User',
-    Creator => 'RT::Model::User',
-    LastUpdatedBy => 'RT::Model::User',
+    owner => 'RT::Model::User',
+    creator => 'RT::Model::User',
+    last_updated_by => 'RT::Model::User',
 );
 my $class = $class{ $primary_group_by };
 

-----------------------------------------------------------------------