[Rt-commit] rt branch, 3.8-approvals-queryfix, updated. rt-3.8.8-148-g032e19a

[? sunnavy]

The branch, 3.8-approvals-queryfix has been updated
       via  032e19a038491354439f33c0e49b9eb614608919 (commit)
      from  9758064e85eea8c9dc3e39df325bd17d13a636e5 (commit)

Summary of changes:
 etc/initialdata      |    4 ++--
 t/approval/admincc.t |    4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 032e19a038491354439f33c0e49b9eb614608919
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Sat Sep 4 01:06:53 2010 +0800

    $Approver->Name is more precise

diff --git a/etc/initialdata b/etc/initialdata
index c29f627..7faa43b 100755
--- a/etc/initialdata
+++ b/etc/initialdata
@@ -331,7 +331,7 @@ batch-process all your pending approvals.
 
 Greetings,
 
-Your ticket has been approved by { eval { $Approval->OwnerObj->Name } }.
+Your ticket has been approved by { eval { $Approver->Name } }.
 Other approvals may be pending.
 
 Approver\'s notes: { $Notes }
@@ -345,7 +345,7 @@ Approver\'s notes: { $Notes }
 
 Greetings,
 
-Your ticket has been approved by { eval { $Approval->OwnerObj->Name } }.
+Your ticket has been approved by { eval { $Approver->Name } }.
 Its Owner may now start to act on it.
 
 Approver\'s notes: { $Notes }
diff --git a/t/approval/admincc.t b/t/approval/admincc.t
index 11452f9..7915b6a 100644
--- a/t/approval/admincc.t
+++ b/t/approval/admincc.t
@@ -183,9 +183,7 @@ for my $admin (qw/coo ceo/) {
         from    => qr/RT System/,
         to      => 'minion at company.com',
         subject => qr/Ticket Approved:/,
-#        body    => qr/approved by \U$admin\E.*notes: Resources exist to be consumed/s
-# TODO current template uses Owner's name :/
-        body    => qr/approved by CTO.*notes: Resources exist to be consumed/s
+        body    => qr/approved by \U$admin\E.*notes: Resources exist to be consumed/s
       },
       {
         from    => qr/\U$admin/,

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