[Rt-commit] rt branch, 3.8-trunk, updated. b8c5e2d1edc5333ff3b8cda42a464f3ff666bd3d

[Ruslan Zakirov]

The branch, 3.8-trunk has been updated
       via  b8c5e2d1edc5333ff3b8cda42a464f3ff666bd3d (commit)
       via  cf21530d7147df06cad76874ad47f548374a4ea7 (commit)
       via  a81958551b0ae37140baa6c2cbf1665ca4ecc643 (commit)
      from  1d39d26f408e7efedbd37c18ef6b0261d94a3f21 (commit)

Summary of changes:
 lib/RT/Report/Tickets.pm       |   10 +++++-----
 share/html/Elements/MakeClicky |    5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit a81958551b0ae37140baa6c2cbf1665ca4ecc643
Author: Ruslan Zakirov <Ruslan.Zakirov at gmail.com>
Date:   Fri Jul 10 01:57:20 2009 +0400

    * fix groupping by multiple fields in reports, first attempt was incorrect

diff --git a/lib/RT/Report/Tickets.pm b/lib/RT/Report/Tickets.pm
index eff02ad..a192ec4 100644
--- a/lib/RT/Report/Tickets.pm
+++ b/lib/RT/Report/Tickets.pm
@@ -125,7 +125,7 @@ sub SetupGroupings {
 
     $self->FromSQL( $args{'Query'} );
     my @group_by = ref( $args{'GroupBy'} )? @{ $args{'GroupBy'} } : ($args{'GroupBy'});
-    $self->GroupBy( FIELD => $_ ) foreach @group_by;
+    $self->GroupBy( map { {FIELD => $_} } @group_by );
 
     # UseSQLForACLChecks may add late joins
     my $joined = ($self->_isJoined || RT->Config->Get('UseSQLForACLChecks')) ? 1 : 0;
@@ -138,12 +138,12 @@ sub SetupGroupings {
 
 sub GroupBy {
     my $self = shift;
-    my %args = ref $_[0]? %{ $_[0] }: (@_);
+    my @args = ref $_[0]? @_ : { @_ };
 
-    push @{ $self->{'_group_by_field'} ||= [] }, $args{'FIELD'};
-    %args = $self->_FieldToFunction( %args );
+    @{ $self->{'_group_by_field'} ||= [] }, map $_->{'FIELD'}, @args;
+    $_ = { $self->_FieldToFunction( %$_ ) } foreach @args;
 
-    $self->SUPER::GroupBy( \%args );
+    $self->SUPER::GroupBy( @args );
 }
 
 sub Column {

commit cf21530d7147df06cad76874ad47f548374a4ea7
Author: Ruslan Zakirov <Ruslan.Zakirov at gmail.com>
Date:   Wed Jul 15 01:51:34 2009 +0400

    * fix all_matches array in make clicky actions
    
    we have to build this array later when we re-match against particular
    regular expressions so we can capture groups from this regexp only

diff --git a/share/html/Elements/MakeClicky b/share/html/Elements/MakeClicky
index 59e562b..f0aaf06 100644
--- a/share/html/Elements/MakeClicky
+++ b/share/html/Elements/MakeClicky
@@ -84,7 +84,10 @@ my @types = (
 my $handle = sub {
     my %args = @_;
     for my $rec( @types ) {
-        return $rec->{action}->( %args ) if $args{value} =~ $rec->{regex};
+        return $rec->{action}->(
+            %args,
+            all_matches => [ $args{value}, $1, $2, $3, $4, $5, $6, $7, $8, $9 ],
+        ) if $args{value} =~ $rec->{regex};
     }
 };
 

commit b8c5e2d1edc5333ff3b8cda42a464f3ff666bd3d
Merge: cf21530... 1d39d26...
Author: Ruslan Zakirov <Ruslan.Zakirov at gmail.com>
Date:   Wed Jul 15 01:53:39 2009 +0400

    Merge branch '3.8-trunk' of git+ssh://diesel.bestpractical.com/git/rt into 3.8-trunk


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