[Rt-commit] rt branch, 3.8/perlcritic, updated. rt-3.8.10-179-g1322430

[Alex Vandiver]

The branch, 3.8/perlcritic has been updated
       via  1322430cedd04a25855b2e77138add9f884a54cf (commit)
       via  6e18d872b061e1f07c9f00875ab5ad78a71448c6 (commit)
       via  50b71988c792997a74994936c078f96c15ecb80f (commit)
       via  e1675b1031c2d3e9d2bba444547929134c8e10ab (commit)
       via  cd653d8cd9b28b4fec9d58d2b42dd752def8a964 (commit)
       via  e5b1ebaae29cb810cefc1a14fc30511eacc0a072 (commit)
       via  4b264c9a632ec3a9916e51afabe0472ecde9a888 (commit)
       via  5f6509da75d9845536b9faafe1adbbfaec236fbe (commit)
       via  e352eb978850609274f22d35508a733f3bd54519 (commit)
       via  6415231f10fb8672da23a1eda97eef403723c5e8 (commit)
      from  202995e2ca1c766e9877b6d97349a7561a0c8b0e (commit)

Summary of changes:
 lib/RT/Approval/Rule/Created.pm            |    2 ++
 lib/RT/Approval/Rule/NewPending.pm         |    2 ++
 lib/RT/Approval/Rule/Passed.pm             |   23 ++++++++++++++++-------
 lib/RT/Approval/Rule/Rejected.pm           |   25 +++++++++++++++++--------
 lib/RT/Interface/Web/Session.pm            |    2 +-
 share/html/Ticket/Elements/ShowTransaction |   14 ++++++++++++++
 6 files changed, 52 insertions(+), 16 deletions(-)

- Log -----------------------------------------------------------------
commit 1322430cedd04a25855b2e77138add9f884a54cf
Merge: 202995e 6e18d87
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Jul 25 15:24:12 2011 -0400

    Merge branch '3.8-trunk' into 3.8/perlcritic

diff --cc lib/RT/Approval/Rule/Created.pm
index 63ddb01,40382f9..f546d60
--- a/lib/RT/Approval/Rule/Created.pm
+++ b/lib/RT/Approval/Rule/Created.pm
@@@ -66,7 -66,8 +66,9 @@@ sub Prepare 
  sub Commit {
      my $self = shift;
      $self->RunScripAction('Open Tickets' => 'Blank');
 +    return;
  }
  
+ RT::Base->_ImportOverlays();
+ 
  1;
diff --cc lib/RT/Approval/Rule/NewPending.pm
index 3a68f93,026f7e6..dc3f0a2
--- a/lib/RT/Approval/Rule/NewPending.pm
+++ b/lib/RT/Approval/Rule/NewPending.pm
@@@ -81,6 -78,22 +81,8 @@@ sub Commit 
      $self->RunScripAction('Notify Owner', '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',
 -                                      TicketObj => $top,
 -                                      TransactionObj => $to)
 -        or return;
 -
 -    my ( $result, $msg ) = $template->Parse(
 -        TicketObj => $top,
 -    );
 -    $self->TicketObj->Comment( CcMessageTo => $self->TicketObj->OwnerObj->EmailAddress,
 -                               MIMEObj => $template->MIMEObj );
 -
  }
  
+ RT::Base->_ImportOverlays();
+ 
  1;
diff --cc lib/RT/Approval/Rule/Rejected.pm
index d5ed862,a97cf47..78c369b
--- a/lib/RT/Approval/Rule/Rejected.pm
+++ b/lib/RT/Approval/Rule/Rejected.pm
@@@ -110,7 -102,23 +103,23 @@@ sub Commit {    # XXX: from custom prep
              );
          }
      }
 -
 +    return;
  }
  
+ 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;

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