[Rt-commit] r17184 - in rt/3.8/branches/ruleset: lib/RT/Approval/Rule

clkao at bestpractical.com clkao at bestpractical.com
Fri Dec 12 06:38:40 EST 2008


Author: clkao
Date: Fri Dec 12 06:38:39 2008
New Revision: 17184

Modified:
   rt/3.8/branches/ruleset/etc/initialdata
   rt/3.8/branches/ruleset/lib/RT/Approval/Rule/NewPending.pm
   rt/3.8/branches/ruleset/lib/RT/Approval/Rule/Passed.pm
   rt/3.8/branches/ruleset/lib/RT/Approval/Rule/Rejected.pm

Log:
prefix the approval templates with "RT ", so it's easier for the upgrade
to process, since the semantics of the templates have also changed.


Modified: rt/3.8/branches/ruleset/etc/initialdata
==============================================================================
--- rt/3.8/branches/ruleset/etc/initialdata	(original)
+++ rt/3.8/branches/ruleset/etc/initialdata	Fri Dec 12 06:38:39 2008
@@ -298,7 +298,7 @@
 '
     },
     {  Queue       => '___Approvals',
-       Name        => "New Pending Approval",    # loc
+       Name        => "RT New Pending Approval",    # loc
        Description =>
          "Notify Owners and AdminCcs of new items pending their approval", # loc
        Content => 'Subject: New Pending Approval: {$Ticket->Subject}
@@ -317,7 +317,7 @@
 '
     },
     {  Queue       => '___Approvals',
-       Name        => "Approval Passed",    # loc
+       Name        => "RT Approval Passed",    # loc
        Description =>
          "Notify Owner of their ticket has been approved by some approver", # loc
        Content => 'Subject: Ticket Approved: {$Ticket->Subject}
@@ -331,7 +331,7 @@
 '
     },
     {  Queue       => '___Approvals',
-       Name        => "All Approvals Passed",    # loc
+       Name        => "RT All Approvals Passed",    # loc
        Description =>
          "Notify Owner of their ticket has been approved by all approvers", # loc
        Content => 'Subject: Ticket Approved: {$Ticket->Subject}
@@ -345,7 +345,7 @@
 '
     },
     {  Queue       => '___Approvals',
-       Name        => "Approval Rejected",    # loc
+       Name        => "RT Approval Rejected",    # loc
        Description =>
          "Notify Owner of their rejected ticket", # loc
        Content => 'Subject: Ticket Rejected: {$Ticket->Subject}

Modified: rt/3.8/branches/ruleset/lib/RT/Approval/Rule/NewPending.pm
==============================================================================
--- rt/3.8/branches/ruleset/lib/RT/Approval/Rule/NewPending.pm	(original)
+++ rt/3.8/branches/ruleset/lib/RT/Approval/Rule/NewPending.pm	Fri Dec 12 06:38:39 2008
@@ -27,13 +27,13 @@
 
     # first txn entry of the approval ticket
     local $self->{TransactionObj} = $to;
-    $self->RunScripAction('Notify Owner', 'New Pending Approval', @_);
+    $self->RunScripAction('Notify Owner', 'RT New Pending Approval', @_);
 
     return;
 
     # this generates more correct content of the message, but not sure
     # if ccmessageto is the right way to do this.
-    my $template = $self->GetTemplate('New Pending Approval',
+    my $template = $self->GetTemplate('RT New Pending Approval',
                                       TicketObj => $top,
                                       TransactionObj => $to)
         or return;

Modified: rt/3.8/branches/ruleset/lib/RT/Approval/Rule/Passed.pm
==============================================================================
--- rt/3.8/branches/ruleset/lib/RT/Approval/Rule/Passed.pm	(original)
+++ rt/3.8/branches/ruleset/lib/RT/Approval/Rule/Passed.pm	Fri Dec 12 06:38:39 2008
@@ -34,7 +34,7 @@
 
     my $passed = !$top->HasUnresolvedDependencies( Type => 'approval' );
     my $template = $self->GetTemplate(
-        $passed ? 'All Approvals Passed' : 'Approval Passed',
+        $passed ? 'RT All Approvals Passed' : 'RT Approval Passed',
         TicketObj => $top,
         Approval => $self->TicketObj,
         Notes => $note,

Modified: rt/3.8/branches/ruleset/lib/RT/Approval/Rule/Rejected.pm
==============================================================================
--- rt/3.8/branches/ruleset/lib/RT/Approval/Rule/Rejected.pm	(original)
+++ rt/3.8/branches/ruleset/lib/RT/Approval/Rule/Rejected.pm	Fri Dec 12 06:38:39 2008
@@ -17,11 +17,12 @@
     my $self = shift;
     if ( my ($rejected) =
         $self->TicketObj->AllDependedOnBy( Type => 'ticket' ) ) {
-        my $template = $self->GetTemplate('Approval Rejected',
+        my $template = $self->GetTemplate('RT Approval Rejected',
                                           TicketObj => $rejected,
                                           Approval  => $self->TicketObj,
                                           Notes     => '')
-            or return;
+;
+        warn "hate software " unless $template->Id;
 
         $rejected->Correspond( MIMEObj => $template->MIMEObj );
         $rejected->SetStatus(


More information about the Rt-commit mailing list