[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.7-268-gb800a8a

[? sunnavy]

The branch, 3.8-trunk has been updated
       via  b800a8ab25c0591110dd9c4445078a4a78470cea (commit)
      from  d69db18defaa3cf6d7506cdae06939b44e7cc677 (commit)

Summary of changes:
 share/html/Search/Elements/Chart |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit b800a8ab25c0591110dd9c4445078a4a78470cea
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Mar 24 22:30:11 2010 +0800

    fix chart table: PrimaryGroupBy could be hourly too

diff --git a/share/html/Search/Elements/Chart b/share/html/Search/Elements/Chart
index d134908..1cc89cf 100644
--- a/share/html/Search/Elements/Chart
+++ b/share/html/Search/Elements/Chart
@@ -84,8 +84,9 @@ while ( my $entry = $tix->Next ) {
 
 # XXX: Convert 1970-01-01 date to the 'Not Set'
 # this code should be generalized!!!
-if ( $PrimaryGroupBy =~ /(Daily|Monthly|Annually)$/ ) {
+if ( $PrimaryGroupBy =~ /(Hourly|Daily|Monthly|Annually)$/ ) {
     my $re;
+    $re = qr{1970-01-01 00} if $PrimaryGroupBy =~ /Hourly$/;
     $re = qr{1970-01-01} if $PrimaryGroupBy =~ /Daily$/;
     $re = qr{1970-01} if $PrimaryGroupBy =~ /Monthly$/;
     $re = qr{1970} if $PrimaryGroupBy =~ /Annually$/;
@@ -128,7 +129,7 @@ my $query_string = $m->comp('/Elements/QueryString', %ARGS);
 <td class="label collection-as-table">
 %# TODO sadly we don't have "creator.city is null" or alike support yet
 %# so no link if the key is undef for now
-% if ( $PrimaryGroupBy !~ /(Daily|Monthly|Annually)$/
+% if ( $PrimaryGroupBy !~ /(Hourly|Daily|Monthly|Annually)$/
 %        && $key ne loc('(no value)') ) {
 % my $group = $PrimaryGroupBy; $group =~ s! !.!;
 % my $QueryString = $m->comp('/Elements/QueryString',

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