[Bps-public-commit] rt-extension-notificationmatrix branch, master, updated. 169b7f01539e46d6163f7c8db348d6e6b5c60663

[Thomas Sibley]

The branch, master has been updated
       via  169b7f01539e46d6163f7c8db348d6e6b5c60663 (commit)
      from  304a850b880e835bc6299d8a04ab5c3915d8a873 (commit)

Summary of changes:
 lib/RT/Extension/NotificationMatrix.pm      |    2 +-
 lib/RT/Extension/NotificationMatrix/Rule.pm |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 169b7f01539e46d6163f7c8db348d6e6b5c60663
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue Jul 26 11:43:02 2011 -0400

    Support queue level template overrides

diff --git a/lib/RT/Extension/NotificationMatrix.pm b/lib/RT/Extension/NotificationMatrix.pm
index e9e305e..254b1ec 100644
--- a/lib/RT/Extension/NotificationMatrix.pm
+++ b/lib/RT/Extension/NotificationMatrix.pm
@@ -2,7 +2,7 @@ use warnings;
 use strict;
 
 package RT::Extension::NotificationMatrix;
-our $VERSION = '1.8';
+our $VERSION = '1.9';
 
 RT::Ruleset->Add(
     Name => 'NotificationMatrix',
diff --git a/lib/RT/Extension/NotificationMatrix/Rule.pm b/lib/RT/Extension/NotificationMatrix/Rule.pm
index 27f6b1d..32099fc 100644
--- a/lib/RT/Extension/NotificationMatrix/Rule.pm
+++ b/lib/RT/Extension/NotificationMatrix/Rule.pm
@@ -100,8 +100,12 @@ sub LoadTemplate {
     $name =~ s/^RT::Extension::NotificationMatrix::Rule::// or die "unknown rule: $name";
     my @templates = $external ? ("$name-External", $self->DefaultExternalTemplate)
                               : ($name,            $self->DefaultTemplate);
+
+    my $queue = $self->TicketObj->QueueObj->Id;
+
     for my $tname (@templates, 'Transaction') {
-        $template->Load($tname);
+        $template->LoadQueueTemplate( Queue => $queue, Name => $tname );
+        $template->LoadGlobalTemplate( $tname ) unless $template->Id;
         last if $template->Id;
     }
 

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