diff options
| author | Mark Wells <mark@freeside.biz> | 2012-09-29 16:36:46 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2012-09-29 16:36:46 -0700 |
| commit | 33beebf4cb42eba3e1dd868ad5e0af102de961da (patch) | |
| tree | 860712543dcc74ff2402a4ed8d73e8cd553e62d4 /rt/share/html/Elements/GnuPG | |
| parent | 7ac86daf67b0a95153b736d5811f9050363f6553 (diff) | |
update address standardization for cust_location changes
Diffstat (limited to 'rt/share/html/Elements/GnuPG')
| -rw-r--r-- | rt/share/html/Elements/GnuPG/KeyIssues | 2 | ||||
| -rw-r--r-- | rt/share/html/Elements/GnuPG/SelectKeyForEncryption | 2 | ||||
| -rw-r--r-- | rt/share/html/Elements/GnuPG/SelectKeyForSigning | 2 | ||||
| -rw-r--r-- | rt/share/html/Elements/GnuPG/SignEncryptWidget | 33 |
4 files changed, 16 insertions, 23 deletions
diff --git a/rt/share/html/Elements/GnuPG/KeyIssues b/rt/share/html/Elements/GnuPG/KeyIssues index 6478b1af2..23276c251 100644 --- a/rt/share/html/Elements/GnuPG/KeyIssues +++ b/rt/share/html/Elements/GnuPG/KeyIssues @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) diff --git a/rt/share/html/Elements/GnuPG/SelectKeyForEncryption b/rt/share/html/Elements/GnuPG/SelectKeyForEncryption index 383553792..d61cde513 100644 --- a/rt/share/html/Elements/GnuPG/SelectKeyForEncryption +++ b/rt/share/html/Elements/GnuPG/SelectKeyForEncryption @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) diff --git a/rt/share/html/Elements/GnuPG/SelectKeyForSigning b/rt/share/html/Elements/GnuPG/SelectKeyForSigning index 8e2b837de..244b46464 100644 --- a/rt/share/html/Elements/GnuPG/SelectKeyForSigning +++ b/rt/share/html/Elements/GnuPG/SelectKeyForSigning @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) diff --git a/rt/share/html/Elements/GnuPG/SignEncryptWidget b/rt/share/html/Elements/GnuPG/SignEncryptWidget index 8be14af73..0ae0f841f 100644 --- a/rt/share/html/Elements/GnuPG/SignEncryptWidget +++ b/rt/share/html/Elements/GnuPG/SignEncryptWidget @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -46,10 +46,15 @@ %# %# END BPS TAGGED BLOCK }}} <table><tr> -<td><% loc('Sign')%></td> -<td><& /Widgets/Form/Boolean:InputOnly, Name => 'Sign', CurrentValue => $self->{'Sign'} &> -using <& SelectKeyForSigning, User => $session{'CurrentUser'}->UserObj &> -</td> +% my $columnsplit = "</td><td>"; +<td><% loc( 'Sign[_1][_2] using [_3]', + $columnsplit, + $m->scomp('/Widgets/Form/Boolean:InputOnly', + Name => 'Sign', CurrentValue => $self->{'Sign'} + ), + $m->scomp('SelectKeyForSigning', User => $session{'CurrentUser'}->UserObj ), +) |n %></td> + <td><% loc('Encrypt')%></td> <td><& /Widgets/Form/Boolean:InputOnly, Name => 'Encrypt', CurrentValue => $self->{'Encrypt'} &></td> </tr></table> @@ -143,23 +148,11 @@ if ( $self->{'Encrypt'} ) { my @recipients; if ( $Operation eq 'Update' ) { - # skip any email addresses that we won't be sending mail to - my %squelch = $m->comp( - '/Ticket/Elements/PreviewScrips:SquelchRecipients', - %$self, - TicketObj => $TicketObj - ); - - @recipients = $m->comp( - '/Ticket/Elements/PreviewScrips:GetRecipients', - %$self, TicketObj => $TicketObj - ); + @recipients = $TicketObj->DryRun(%$self)->Recipients; } elsif ( $Operation eq 'Create' ) { - @recipients = $m->comp( - '/Ticket/Elements/PreviewScrips:GetRecipientsOnCreate', - %$self, - ); + $TicketObj = RT::Ticket->new( $session{'CurrentUser'} ); + @recipients = $TicketObj->DryRunCreate(%$self)->Recipients; } else { $RT::Logger->crit('Incorrect operation: '. $Operation ); |