diff options
Diffstat (limited to 'Kernel/Output')
| -rw-r--r-- | Kernel/Output/HTML/DefaultRecipient.pm | 23 | ||||
| -rw-r--r-- | Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt | 16 |
2 files changed, 36 insertions, 3 deletions
diff --git a/Kernel/Output/HTML/DefaultRecipient.pm b/Kernel/Output/HTML/DefaultRecipient.pm index 775abb2..3965d9a 100644 --- a/Kernel/Output/HTML/DefaultRecipient.pm +++ b/Kernel/Output/HTML/DefaultRecipient.pm @@ -64,7 +64,9 @@ sub Run { ); my $RemoveTo = 0; - my @Addresses = (); + my @ToAddresses = (); + my @CcAddresses = (); + my @BccAddresses = (); foreach my $ID ( values %MappedDefaultRecipient ) { my %DefaultRecipient = $Self->{DefaultRecipientObject}->Get( ID => $ID, @@ -72,7 +74,13 @@ sub Run { $RemoveTo = 1 if $DefaultRecipient{RemoveTo}; if ( $DefaultRecipient{AddTo} ne '' ) { - push @Addresses, $DefaultRecipient{AddTo}; + push @ToAddresses, $DefaultRecipient{AddTo}; + } + if ( $DefaultRecipient{AddCc} ne '' ) { + push @CcAddresses, $DefaultRecipient{AddCc}; + } + if ( $DefaultRecipient{AddBcc} ne '' ) { + push @BccAddresses, $DefaultRecipient{AddBcc}; } } @@ -88,7 +96,7 @@ sub Run { } # add new addresses - foreach my $Address ( @Addresses ) { + foreach my $Address ( @ToAddresses ) { $Self->{LayoutObject}->Block( Name => 'PreFilledToRow', Data => { @@ -97,6 +105,15 @@ sub Run { ); } + foreach my $Address ( @CcAddresses ) { + $Self->{LayoutObject}->Block( + Name => 'PreFilledCcRow', + Data => { + Email => $Address, + }, + ); + } + return $Param{Data}; } diff --git a/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt b/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt index 03ec6a3..84d4dbb 100644 --- a/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt +++ b/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt @@ -72,6 +72,8 @@ <th>[% Translate("Title") | html %]</th> <th>[% Translate("Remove 'To'") | html %]</th> <th>[% Translate("New 'To'") | html %]</th> + <th>[% Translate("New 'Cc'") | html %]</th> + <th>[% Translate("New 'Bcc'") | html %]</th> <th>[% Translate("Comment") | html %]</th> <th>[% Translate("Changed") | html %]</th> <th>[% Translate("Created") | html %]</th> @@ -96,6 +98,8 @@ </td> <td>[% Translate(Data.RemoveToYesNo) | html %]</td> <td>[% Data.AddTo | html %]</td> + <td>[% Data.AddCc | html %]</td> + <td>[% Data.AddBcc | html %]</td> <td title="[% Data.Comment | html %]">[% Data.Comment | truncate(26) | html %]</td> <td>[% Data.ChangeTime | Localize("TimeShort") %]</td> <td>[% Data.CreateTime | Localize("TimeShort") %]</td> @@ -163,6 +167,18 @@ </div> <div class="Clear"></div> + <label for="AddCc">[% Translate("New 'Cc'") | html %]:</label> + <div class="Field"> + <input type="text" name="AddCc" id="AddCc" value="[% Data.AddCc | html %]" class="W50pc" maxlength="200"/> + </div> + <div class="Clear"></div> + + <label for="AddBcc">[% Translate("New 'Bcc'") | html %]:</label> + <div class="Field"> + <input type="text" name="AddBcc" id="AddBcc" value="[% Data.AddBcc | html %]" class="W50pc" maxlength="200"/> + </div> + <div class="Clear"></div> + <label for="Comment">[% Translate("Comment") | html %]:</label> <div class="Field"> <input type="text" name="Comment" id="Comment" value="[% Data.Comment | html %]" class="W50pc" maxlength="250"/> |