[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.10-16-ge1675b1

[Alex Vandiver]

The branch, 3.8-trunk has been updated
       via  e1675b1031c2d3e9d2bba444547929134c8e10ab (commit)
       via  5f6509da75d9845536b9faafe1adbbfaec236fbe (commit)
      from  cd653d8cd9b28b4fec9d58d2b42dd752def8a964 (commit)

Summary of changes:
 lib/RT/Approval/Rule/Passed.pm   |   21 ++++++++++++++-------
 lib/RT/Approval/Rule/Rejected.pm |   23 +++++++++++++++--------
 2 files changed, 29 insertions(+), 15 deletions(-)

- Log -----------------------------------------------------------------
commit e1675b1031c2d3e9d2bba444547929134c8e10ab
Merge: cd653d8 5f6509d
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Jul 19 15:47:28 2011 -0400

    Merge branch '3.8/overridable-approval-notes' into 3.8-trunk
    
    Conflicts:
    	lib/RT/Approval/Rule/Passed.pm
    	lib/RT/Approval/Rule/Rejected.pm

diff --cc lib/RT/Approval/Rule/Passed.pm
index c8544fc,65d90d1..e0560ba
--- a/lib/RT/Approval/Rule/Passed.pm
+++ b/lib/RT/Approval/Rule/Passed.pm
@@@ -108,6 -102,17 +102,19 @@@ sub Commit 
      return;
  }
  
+ sub GetNotes {
+     my $self = shift;
+     my $t = $self->TicketObj->Transactions;
+     my $note = '';
+ 
+     while ( my $o = $t->Next ) {
+         next unless $o->Type eq 'Correspond';
+         $note .= $o->Content . "\n" if $o->ContentObj;
+     }
+     return $note;
+ 
+ }
+ 
 +RT::Base->_ImportOverlays();
 +
  1;
diff --cc lib/RT/Approval/Rule/Rejected.pm
index 6ca43aa,73cb0bc..a97cf47
--- a/lib/RT/Approval/Rule/Rejected.pm
+++ b/lib/RT/Approval/Rule/Rejected.pm
@@@ -112,6 -105,18 +105,20 @@@ sub Commit {    # XXX: from custom prep
  
  }
  
+ sub GetNotes {
+     my $self = shift;
+     my $note = '';
+ 
+     if ( RT->Config->Get('ApprovalRejectionNotes') ) {
+         my $t = $self->TicketObj->Transactions;
+         while ( my $o = $t->Next ) {
+             next unless $o->Type eq 'Correspond';
+             $note .= $o->Content . "\n" if $o->ContentObj;
+         }
+     }
+     return $note;
+ }
+ 
 +RT::Base->_ImportOverlays();
 +
  1;

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