[Rt-commit] rt branch, 3.8-forward-message-encoding, updated. 0348c917086785bedaa775491b84a175de26eb2b

[Kevin Falcone]

The branch, 3.8-forward-message-encoding has been updated
       via  0348c917086785bedaa775491b84a175de26eb2b (commit)
       via  573272363b6b2fb092a47ba50ca42f0961340e8f (commit)
      from  f64e9d2ea218b75c2b7a911f77e1afd40d48b14a (commit)

Summary of changes:
 UPGRADING                 |    8 ++++++++
 etc/initialdata           |    9 ++++++++-
 etc/upgrade/3.8.6/content |   10 ++++++++++
 lib/RT/Interface/Email.pm |    2 +-
 4 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 etc/upgrade/3.8.6/content

- Log -----------------------------------------------------------------
commit 573272363b6b2fb092a47ba50ca42f0961340e8f
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Wed Oct 7 14:29:52 2009 -0400

    Split forwarding templates
    
    Forward - for transactions
    Forward Ticket - for whole tickets

diff --git a/etc/initialdata b/etc/initialdata
index 912332a..ff7e7b9 100755
--- a/etc/initialdata
+++ b/etc/initialdata
@@ -380,8 +380,15 @@ The ticket has been approved, you may now start to act on it.
        Name        => "Forward",    # loc
        Description => "Heading of a forwarded message", # loc
        Content => q{
+This is a forward of transaction #{$Transaction->id} of ticket #{ $Ticket->id }
+}
+    },
+    {  Queue       => 0,
+       Name        => "Forward Ticket",    # loc
+       Description => "Heading of a forwarded Ticket", # loc
+       Content => q{
 
-This is a forward{ $Transaction? (' of transaction #'. $Transaction->id) : '' } of ticket #{ $Ticket->id }
+This is a forward of ticket #{ $Ticket->id }
 }
     },
     {  Queue       => 0,
diff --git a/lib/RT/Interface/Email.pm b/lib/RT/Interface/Email.pm
index c1da02e..1279816 100755
--- a/lib/RT/Interface/Email.pm
+++ b/lib/RT/Interface/Email.pm
@@ -584,7 +584,7 @@ sub ForwardTicket {
         map $_->ContentAsMIME,
         @{ $txns->ItemsArrayRef };
 
-    return SendForward( %args, Entity => $entity, Ticket => $ticket );
+    return SendForward( %args, Entity => $entity, Ticket => $ticket, Template => 'Forward Ticket' );
 }
 
 =head2 SendForward Entity => undef, Ticket => undef, Transaction => undef, Template => undef, To => '', Cc => '', Bcc => ''

commit 0348c917086785bedaa775491b84a175de26eb2b
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Wed Oct 7 14:30:19 2009 -0400

    Add the Forward Ticket template on upgrade

diff --git a/UPGRADING b/UPGRADING
index 66ab9a4..34d21a7 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -18,6 +18,14 @@ If you are using MySQL, please read the instructions in UPGRADING.mysql as
 well.
 
 *******
+UPGRADING FROM 3.8.5 and earlier - Changes:
+
+You can now forward an entire Ticket history (in addition to specific transactions)
+but this requires a new Template called forward ticket.  This template will be added
+when you run.
+
+/opt/rt3/sbin/rt-setup-database --dba root --prompt-for-dba-password --action upgrade
+
 UPGRADING FROM 3.8.3 and earlier - Changes:
 
 Arguments to the NotifyGroup Scrip Action need
diff --git a/etc/upgrade/3.8.6/content b/etc/upgrade/3.8.6/content
new file mode 100644
index 0000000..a9793c6
--- /dev/null
+++ b/etc/upgrade/3.8.6/content
@@ -0,0 +1,10 @@
+ at Templates = (
+    {  Queue       => 0,
+       Name        => "Forward Ticket",    # loc
+       Description => "Heading of a forwarded Ticket", # loc
+       Content => q{
+
+This is a forward of ticket #{ $Ticket->id }
+}
+    },
+);

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