[Rt-commit] rtir branch, 2.4-trunk, updated. 2.4.5rc1-1-g2745f9c

[Ruslan Zakirov]

The branch, 2.4-trunk has been updated
       via  2745f9cd2786b4764b3f09545f49357276e14584 (commit)
      from  03da1acacb9af8bf2dc601ba44b03f4432b9e309 (commit)

Summary of changes:
 CHANGES         |    9 +++++++++
 UPGRADING       |   12 ++++++++++++
 etc/initialdata |    6 +++---
 3 files changed, 24 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 2745f9cd2786b4764b3f09545f49357276e14584
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Sat Oct 16 04:55:56 2010 +0400

    respect SubjectTag in text of outgoing emails

diff --git a/CHANGES b/CHANGES
index f264381..71b2906 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+CHANGES IN 2.4.6
+----------------
+
+BUGS
+====
+
+* respect per queue SubjectTag in templates. Read UPGRADING for
+  upgrade instructions.
+
 CHANGES IN 2.4.5
 ----------------
 
diff --git a/UPGRADING b/UPGRADING
index cdd7a81..9a5003b 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -75,6 +75,18 @@ General upgrade instructions
             --prompt-for-dba-password --action insert \
             --datadir etc/upgrade/<version>
 
+Upgrading from 2.4.5 and earlier
+-------------------------
+
+SubjectTag was ignored in RTIR templates, so users could be confused.
+Find all templates with the following text:
+
+    [{$rtname} #{$Ticket->id}]
+
+And replace it with:
+
+    [{$Ticket->QueueObj->SubjectTag || $rtname} #{$Ticket->id}]
+
 Upgrading from 2.3.17 and earlier
 -------------------------
 
diff --git a/etc/initialdata b/etc/initialdata
index b2188dd..ef19443 100644
--- a/etc/initialdata
+++ b/etc/initialdata
@@ -599,7 +599,7 @@ Subject: { $Ticket->Subject }
 -------------------------------------------------------------------------
 Please include the string:
 
-         [{ $rtname } #{ $Ticket->id }]
+         [{ $Ticket->QueueObj->SubjectTag || $rtname } #{ $Ticket->id }]
 
 in the subject line of all future correspondence about this issue. To do so, 
 you may reply to this message.
@@ -637,7 +637,7 @@ Block #{$Ticket->id} was removed.
 -------------------------------------------------------------------------
 Please include the string:
 
-         [{$rtname} #{$Ticket->id}]
+         [{ $Ticket->QueueObj->SubjectTag || $rtname } #{$Ticket->id}]
 
 in the subject line of all future correspondence about this issue. To do so, 
 you may reply to this message.
@@ -655,7 +655,7 @@ Subject: {$Ticket->Subject}
 -------------------------------------------------------------------------
 Please include the string:
 
-         [{$rtname} #{$Ticket->id}]
+         [{ $Ticket->QueueObj->SubjectTag || $rtname } #{$Ticket->id}]
 
 in the subject line of all future correspondence about this issue. To do so, 
 you may reply to this message.

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