X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Flib%2FRT%2FScripAction_Overlay.pm;h=e759871350fb3df60657928a6d9a2258d773adfd;hp=e2b018aafe146033302f6f5e43ad2533660a8850;hb=289340780927b5bac2c7604d7317c3063c6dd8cc;hpb=945721f48f74d5cfffef7c7cf3a3d6bc2521f5dd

diff --git a/rt/lib/RT/ScripAction_Overlay.pm b/rt/lib/RT/ScripAction_Overlay.pm
index e2b018aaf..e75987135 100644
--- a/rt/lib/RT/ScripAction_Overlay.pm
+++ b/rt/lib/RT/ScripAction_Overlay.pm
@@ -48,6 +48,7 @@ ok (require RT::ScripAction);
 
 use strict;
 no warnings qw(redefine);
+use RT::Template;
 
 # {{{  sub _Init 
 sub _Init  {
@@ -135,6 +136,8 @@ sub LoadAction  {
     my %args = ( TransactionObj => undef,
 		 TicketObj => undef,
 		 @_ );
+
+    $self->{_TicketObj} = $args{TicketObj};
     
     #TODO: Put this in an eval  
     $self->ExecModule =~ /^(\w+)$/;
@@ -164,14 +167,26 @@ Return this action\'s template object
 sub TemplateObj {
     my $self = shift;
     return undef unless $self->{Template};
-    if (!$self->{'TemplateObj'})  {
-	require RT::Template;
-	$self->{'TemplateObj'} = RT::Template->new($self->CurrentUser);
-	$self->{'TemplateObj'}->LoadById($self->{'Template'});
-	
+    if ( !$self->{'TemplateObj'} ) {
+        $self->{'TemplateObj'} = RT::Template->new( $self->CurrentUser );
+        $self->{'TemplateObj'}->LoadById( $self->{'Template'} );
+
+        if ( ( $self->{'TemplateObj'}->__Value('Queue') == 0 )
+            && $self->{'_TicketObj'} ) {
+            my $tmptemplate = RT::Template->new( $self->CurrentUser );
+            my ( $ok, $err ) = $tmptemplate->LoadQueueTemplate(
+                Queue => $self->{'_TicketObj'}->QueueObj->id,
+                Name  => $self->{'TemplateObj'}->Name);
+
+            if ( $tmptemplate->id ) {
+                # found the queue-specific template with the same name
+                $self->{'TemplateObj'} = $tmptemplate;
+            }
+        }
+
     }
-    
-    return ($self->{'TemplateObj'});
+
+    return ( $self->{'TemplateObj'} );
 }
 # }}}
 
@@ -206,6 +221,7 @@ sub Describe  {
 # {{{ sub DESTROY
 sub DESTROY {
     my $self=shift;
+    $self->{'_TicketObj'} = undef;
     $self->{'Action'} = undef;
     $self->{'TemplateObj'} = undef;
 }