[Rt-commit] r10169 - in rt/branches/3.999-DANGEROUS: lib/RT lib/RT/Interface lib/RT/Model

[jesse at bestpractical.com]

Author: jesse
Date: Fri Dec 28 00:16:07 2007
New Revision: 10169

Modified:
   rt/branches/3.999-DANGEROUS/   (props changed)
   rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Record.pm

Log:
 r74266 at pinglin:  jesse | 2007-12-28 00:09:59 -0500
 CommitScrips -> 'commit_scrips'
 


Modified: rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm	Fri Dec 28 00:16:07 2007
@@ -340,6 +340,7 @@
         Transaction => undef,
         @_,
     );
+    $RT::Logger->warning("In send email for ".join(',',%args));
     foreach my $arg( qw(Entity Bounce) ) {
         next unless defined $args{ lc $arg };
 
@@ -400,6 +401,7 @@
 
     my $mail_command = RT->Config->Get('MailCommand');
 
+    $RT::Logger->crit( "My mail command is $mail_command");
     # if it is a sub routine, we just return it;
     return $mail_command->($args{'Entity'}) if UNIVERSAL::isa( $mail_command, 'CODE' );
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm	Fri Dec 28 00:16:07 2007
@@ -699,7 +699,7 @@
             Type         => "Create",
             TimeTaken    => $args{'time_worked'},
             MIMEObj      => $args{'MIMEObj'},
-            CommitScrips => !$args{'DryRun'},
+            commit_scrips => !$args{'DryRun'},
         );
         if ( $self->id && $Trans ) {
 
@@ -2031,7 +2031,7 @@
 
     if ($args{'DryRun'}) {
         Jifty->handle->begin_transaction();
-        $args{'CommitScrips'} = 0;
+        $args{'commit_scrips'} = 0;
     }
 
     my @results = $self->_RecordNote(%args);
@@ -2080,7 +2080,7 @@
     $args{'NoteType'} = 'Correspond'; 
     if ($args{'DryRun'}) {
         Jifty->handle->begin_transaction();
-        $args{'CommitScrips'} = 0;
+        $args{'commit_scrips'} = 0;
     }
 
     my @results = $self->_RecordNote(%args);
@@ -2120,7 +2120,7 @@
         Content      => undef,
         NoteType     => 'Correspond',
         TimeTaken    => 0,
-        CommitScrips => 1,
+        commit_scrips => 1,
         @_
     );
 
@@ -2185,7 +2185,7 @@
              Data => ( $args{'MIMEObj'}->head->get('subject') || 'No Subject' ),
              TimeTaken => $args{'TimeTaken'},
              MIMEObj   => $args{'MIMEObj'}, 
-             CommitScrips => $args{'CommitScrips'},
+             commit_scrips => $args{'commit_scrips'},
     );
 
     unless ($Trans) {

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm	Fri Dec 28 00:16:07 2007
@@ -301,7 +301,7 @@
         NewValue       => undef,
         MIMEObj        => undef,
         ActivateScrips => 1,
-        CommitScrips => 1,
+        commit_scrips => 1,
 	object_type => 'RT::Model::Ticket',
 	object_id => 0,
 	ReferenceType => undef,
@@ -363,10 +363,13 @@
             Ticket      => $args{'object_id'},
             Transaction => $self->id,
         );
-        if ($args{'CommitScrips'} ) {
+        if ($args{'commit_scrips'} ) {
             $RT::Logger->debug('About to commit scrips for transaction #' .$self->id);
             $self->{'scrips'}->commit();
-        }
+        } else {
+            $RT::Logger->debug('Skipping commit of scrips for transaction #' .$self->id);
+
+        }            
     }
 
     return ( $id, _("Transaction Created") );

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Record.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Record.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Record.pm	Fri Dec 28 00:16:07 2007
@@ -1210,7 +1210,7 @@
         Field     => undef,
         MIMEObj   => undef,
         ActivateScrips => 1,
-        CommitScrips => 1,
+        commit_scrips => 1,
         @_
     );
 
@@ -1242,7 +1242,7 @@
         ReferenceType => $ref_type,
         MIMEObj   => $args{'MIMEObj'},
         ActivateScrips => $args{'ActivateScrips'},
-        CommitScrips => $args{'CommitScrips'},
+        commit_scrips => $args{'commit_scrips'},
     );
 
 
@@ -1257,7 +1257,7 @@
         $self->_UpdateTimeTaken( $args{'TimeTaken'} );
     }
     if ( RT->Config->Get('UseTransactionBatch') and $transaction ) {
-	    push @{$self->{_TransactionBatch}}, $trans if $args{'CommitScrips'};
+	    push @{$self->{_TransactionBatch}}, $trans if $args{'commit_scrips'};
     }
     return ( $transaction, $msg, $trans );
 }