[Rt-commit] rt branch, 4.2/squelch-encryption-recipients, created. rt-4.2.1-19-gfa67850
Alex Vandiver
alexmv at bestpractical.com
Thu Nov 21 17:07:34 EST 2013
The branch, 4.2/squelch-encryption-recipients has been created
at fa67850626fa6bdf5dca545ed5f8c54563b29853 (commit)
- Log -----------------------------------------------------------------
commit fa67850626fa6bdf5dca545ed5f8c54563b29853
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Wed Sep 18 16:56:19 2013 -0400
Respect transaction squelching for signing/encryption
diff --git a/lib/RT/Ticket.pm b/lib/RT/Ticket.pm
index 80af7f5..8a9b7ef 100644
--- a/lib/RT/Ticket.pm
+++ b/lib/RT/Ticket.pm
@@ -1657,6 +1657,7 @@ sub DryRun {
MIMEObj => $Message,
TimeTaken => $args{'UpdateTimeWorked'},
DryRun => 1,
+ SquelchMailTo => $args{'SquelchMailTo'},
);
unless ( $Transaction ) {
$RT::Logger->error("Couldn't fire '$action' action: $Description");
diff --git a/share/html/Ticket/Update.html b/share/html/Ticket/Update.html
index 8c9b304..d5723a1 100644
--- a/share/html/Ticket/Update.html
+++ b/share/html/Ticket/Update.html
@@ -252,6 +252,9 @@ $CanComment = 1 if ( $TicketObj->CurrentUserHasRight('CommentOnTicket') or
ProcessAttachments(ARGSRef => \%ARGS);
+my %squelched = ProcessTransactionSquelching( \%ARGS );
+$ARGS{'SquelchMailTo'} = [keys %squelched] if keys %squelched;
+
my $gnupg_widget = $m->comp('/Elements/Crypt/SignEncryptWidget:new', Arguments => \%ARGS );
$m->comp( '/Elements/Crypt/SignEncryptWidget:Process',
self => $gnupg_widget,
@@ -260,9 +263,6 @@ $m->comp( '/Elements/Crypt/SignEncryptWidget:Process',
if ( $ARGS{'SubmitTicket'} ) {
- my %squelched = ProcessTransactionSquelching( \%ARGS );
- $ARGS{'SquelchMailTo'} = [keys %squelched] if keys %squelched;
-
my ($status, @msg) = $m->comp(
'/Elements/ValidateCustomFields',
CustomFields => $TicketObj->TransactionCustomFields,
-----------------------------------------------------------------------
More information about the rt-commit
mailing list