[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-726-ga7febc5

[Alex Vandiver]

The branch, 3.9-trunk has been updated
       via  a7febc59dcc3acf7c2bd5e671d036ea410a75351 (commit)
       via  64f5bd87c841fba903cdba9a5160f81ab70e662e (commit)
       via  25792acd72a7afb4c538c0a449edb59afb726553 (commit)
       via  5a5c67dc23924f2d31fe81f855bd01b007e5cb1a (commit)
       via  3238798a9dee1d606d5a70a7cb964789502ef2b6 (commit)
       via  4757190e2f716db75ac15b118198c0b2195051ea (commit)
      from  e4f900a3659edcba5d7e7f62d130f23c4c61818d (commit)

Summary of changes:
 lib/RT/Ticket_Overlay.pm                    |   83 +++++++++++++
 lib/RT/Transaction_Overlay.pm               |   31 +++++
 share/html/Elements/GnuPG/SignEncryptWidget |   18 +---
 share/html/Ticket/Elements/PreviewScrips    |  173 ++++-----------------------
 share/html/Ticket/Elements/Tabs             |    2 +
 share/html/Ticket/Update.html               |   24 ++++-
 6 files changed, 166 insertions(+), 165 deletions(-)

- Log -----------------------------------------------------------------
commit a7febc59dcc3acf7c2bd5e671d036ea410a75351
Merge: e4f900a 64f5bd8
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Sep 7 17:41:44 2010 -0400

    Merge branch 'squelch' into 3.9-trunk
    
    Conflicts:
    	share/html/Ticket/Elements/Tabs

diff --cc share/html/Ticket/Elements/Tabs
index 7d58477,b371d72..f753513
--- a/share/html/Ticket/Elements/Tabs
+++ b/share/html/Ticket/Elements/Tabs
@@@ -276,21 -262,16 +276,23 @@@ if (( defined $actions->{B} || defined 
  
      if    ( defined $actions->{C} ) { $actions->{C}->{separator} = 1 }
      elsif ( defined $actions->{B} ) { $actions->{B}->{separator} = 1 }
 -    elsif ( defined $actions->{A} ) { $actions->{A}->{separator} = 1 }
 +}
 +
 +$actions->{ 'G' . 1 }{pre_separator} = 1;
 +
 +# Separator between the last status and the next set of actions
 +$actions->{ 'G' . ( $i - 1 ) }{separator} = 1;
  }
  
+ $actions = $ARGS{actions} if defined $ARGS{actions};
+ 
 -my $args = '';
 +my $args      = '';
  my $has_query = '';
  my %query_args;
 -my $search_id = $ARGS{'SavedSearchId'}
 -            || $session{'CurrentSearchHash'}->{'SearchId'} || '';
 +my $search_id
 +    = $ARGS{'SavedSearchId'}
 +    || $session{'CurrentSearchHash'}->{'SearchId'}
 +    || '';
  my $chart_search_id = $ARGS{'SavedChartSearchId'} || '';
  
  $has_query = 1 if ( $ARGS{'Query'} or $session{'CurrentSearchHash'}->{'Query'} );

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