From 1362aa1c73ab8d82a6a70156e9b3397eb4490381 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alex@spline.inf.fu-berlin.de>
Date: Tue, 24 May 2016 21:46:10 +0200
Subject: Add possibility to also drop preselected Cc

---
 Kernel/Modules/AdminDefaultRecipient.pm | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'Kernel/Modules/AdminDefaultRecipient.pm')

diff --git a/Kernel/Modules/AdminDefaultRecipient.pm b/Kernel/Modules/AdminDefaultRecipient.pm
index 5269c75..1b8d6c3 100644
--- a/Kernel/Modules/AdminDefaultRecipient.pm
+++ b/Kernel/Modules/AdminDefaultRecipient.pm
@@ -67,7 +67,7 @@ sub Run {
         my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient');
         my @NewIDs = $ParamObject->GetArray( Param => 'IDs' );
         my ( %GetParam, %Errors );
-        for my $Parameter (qw(ID Title RemoveTo To Cc Bcc Comment)) {
+        for my $Parameter (qw(ID Title RemoveTo RemoveCc To Cc Bcc Comment)) {
             $GetParam{$Parameter} = $ParamObject->GetParam(
                 Param => $Parameter
             );
@@ -161,7 +161,7 @@ sub Run {
         my @NewIDs = $ParamObject->GetArray( Param => 'IDs' );
         my ( %GetParam, %Errors );
 
-        for my $Parameter (qw(ID Title RemoveTo To Cc Bcc Comment)) {
+        for my $Parameter (qw(ID Title RemoveTo RemoveCc To Cc Bcc Comment)) {
             $GetParam{$Parameter} = $ParamObject->GetParam( Param => $Parameter );
         }
 
@@ -265,11 +265,14 @@ sub _Edit {
     $LayoutObject->Block( Name => 'ActionList' );
     $LayoutObject->Block( Name => 'ActionOverview' );
 
-    $Param{DefaultRecipientRemoveToOption} = $LayoutObject->BuildSelection(
-        Data       => $ConfigObject->Get('YesNoOptions'),
-        Name       => 'RemoveTo',
-        SelectedID => $Param{RemoveTo} || 0,
-    );
+    for my $addr (qw(To Cc)) {
+        $Param{'DefaultRecipientRemove' . $addr . 'Option'} =
+            $LayoutObject->BuildSelection(
+                Data       => $ConfigObject->Get('YesNoOptions'),
+                Name       => 'Remove' . $addr,
+                SelectedID => $Param{'Remove' . $addr} || 0,
+            );
+    }
 
     $LayoutObject->Block(
         Name => 'OverviewUpdate',
@@ -329,6 +332,7 @@ sub _Overview {
             Name => 'OverviewResultRow',
             Data => {
                 RemoveToYesNo => $YesNo{ $DefaultRecipient{RemoveTo} },
+                RemoveCcYesNo => $YesNo{ $DefaultRecipient{RemoveCc} },
                 %DefaultRecipient,
             },
         );
-- 
cgit v1.2.3-1-g7c22