diff options
Diffstat (limited to 'Kernel/Output')
| -rw-r--r-- | Kernel/Output/HTML/ArticleCompose/DefaultRecipient.pm | 15 | ||||
| -rw-r--r-- | Kernel/Output/HTML/Templates/Standard/AdminDefaultRecipient.tt | 8 |
2 files changed, 18 insertions, 5 deletions
diff --git a/Kernel/Output/HTML/ArticleCompose/DefaultRecipient.pm b/Kernel/Output/HTML/ArticleCompose/DefaultRecipient.pm index 2a8a9a9..6b92ea4 100644 --- a/Kernel/Output/HTML/ArticleCompose/DefaultRecipient.pm +++ b/Kernel/Output/HTML/ArticleCompose/DefaultRecipient.pm @@ -51,14 +51,16 @@ sub Run { TemplateID => $Self->{ResponseID}, ); - my $RemoveTo = 0; + my %Remove = ( To => 0, Cc => 0 ); my %Addresses = ( To => [], Cc => [], Bcc => [] ); foreach my $ID ( values %MappedDefaultRecipient ) { my %DefaultRecipient = $DefaultRecipientObject->Get( ID => $ID, ); - $RemoveTo = 1 if $DefaultRecipient{RemoveTo}; + for my $addr (qw(To Cc)) { + $Remove{$addr} = 1 if $DefaultRecipient{'Remove' . $addr}; + } for my $addr (qw(To Cc Bcc)) { if ( $DefaultRecipient{ $addr } ne '' ) { @@ -67,13 +69,16 @@ sub Run { } } - if ( $RemoveTo ) { - # remove preselected "To" address + if ( $Remove{To} || $Remove{Cc} ) { + # remove preselected addresses my @blocks = (); BLOCK: for my $block (@{$Self->{LayoutObject}{_JSOnDocumentComplete}}) { - next BLOCK if $block =~ m/Core\.Agent\.CustomerSearch\.AddTicketCustomer\(\s*'ToCustomer'/; + for my $addr (qw(To Cc)) { + next BLOCK if $Remove{$addr} && + $block =~ qr/Core\.Agent\.CustomerSearch\.AddTicketCustomer\(\s*'${addr}Customer'/; + } push @blocks, $block; } diff --git a/Kernel/Output/HTML/Templates/Standard/AdminDefaultRecipient.tt b/Kernel/Output/HTML/Templates/Standard/AdminDefaultRecipient.tt index 1d54bb7..f6f268c 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminDefaultRecipient.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminDefaultRecipient.tt @@ -71,6 +71,7 @@ <tr> <th>[% Translate("Title") | html %]</th> <th>[% Translate("Remove 'To'") | html %]</th> + <th>[% Translate("Remove 'Cc'") | html %]</th> <th>[% Translate("To") | html %]</th> <th>[% Translate("Cc") | html %]</th> <th>[% Translate("Bcc") | html %]</th> @@ -97,6 +98,7 @@ <a class="AsBlock" href="[% Env("Baselink") %]Action=[% Env("Action") %];Subaction=Change;ID=[% Data.ID | uri %]">[% Data.Title | html %]</a> </td> <td>[% Translate(Data.RemoveToYesNo) | html %]</td> + <td>[% Translate(Data.RemoveCcYesNo) | html %]</td> <td>[% Data.To | html %]</td> <td>[% Data.Cc | html %]</td> <td>[% Data.Bcc | html %]</td> @@ -161,6 +163,12 @@ </div> <div class="Clear"></div> + <label for="RemoveCc">[% Translate("Remove 'Cc'") | html %]:</label> + <div class="Field"> + [% Data.DefaultRecipientRemoveCcOption %] + </div> + <div class="Clear"></div> + <label for="To">[% Translate("To") | html %]:</label> <div class="Field"> <input type="text" name="To" id="To" value="[% Data.To | html %]" class="W50pc" maxlength="200"/> |