diff options
Diffstat (limited to 'rt/lib/RT/Scrips_Overlay.pm')
| -rw-r--r-- | rt/lib/RT/Scrips_Overlay.pm | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/rt/lib/RT/Scrips_Overlay.pm b/rt/lib/RT/Scrips_Overlay.pm index 0f606c884..2f395ffd0 100644 --- a/rt/lib/RT/Scrips_Overlay.pm +++ b/rt/lib/RT/Scrips_Overlay.pm @@ -1,8 +1,8 @@ -# BEGIN BPS TAGGED BLOCK {{{ +# {{{ BEGIN BPS TAGGED BLOCK # # COPYRIGHT: # -# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC # <jesse@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -42,8 +42,7 @@ # works based on those contributions, and sublicense and distribute # those contributions and any derivatives thereof. # -# END BPS TAGGED BLOCK }}} - +# }}} END BPS TAGGED BLOCK =head1 NAME RT::Scrips - a collection of RT Scrip objects @@ -66,9 +65,6 @@ ok (require RT::Scrips); =cut - -package RT::Scrips; - use strict; no warnings qw(redefine); @@ -258,7 +254,6 @@ sub Prepared { # {{{ sup _SetupSourceObjects - =head2 _SetupSourceObjects { TicketObj , Ticket, Transaction, TransactionObj } Setup a ticket and transaction for this Scrip collection to work with as it runs through the @@ -318,8 +313,8 @@ sub _FindScrips { $self->LimitToQueue( $self->{'TicketObj'}->QueueObj->Id ) ; #Limit it to $Ticket->QueueObj->Id - $self->LimitToGlobal(); - # or to "global" + $self->LimitToGlobal() + unless $self->{'TicketObj'}->QueueObj->Disabled; # or to "global" $self->Limit( FIELD => "Stage", VALUE => $args{'Stage'} ); @@ -333,16 +328,14 @@ sub _FindScrips { ); #We only want things where the scrip applies to this sort of transaction - # TransactionBatch stage can define list of transaction - foreach( split /\s*,\s*/, ($args{'Type'} || '') ) { - $self->Limit( - ALIAS => $ConditionsAlias, - FIELD => 'ApplicableTransTypes', - OPERATOR => 'LIKE', - VALUE => $_, - ENTRYAGGREGATOR => 'OR', - ) - } + $self->Limit( + ALIAS => $ConditionsAlias, + FIELD => 'ApplicableTransTypes', + OPERATOR => 'LIKE', + VALUE => $args{'Type'}, + ENTRYAGGREGATOR => 'OR', + ) + if $args{'Type'}; # Or where the scrip applies to any transaction $self->Limit( |