From e6185fb9a55ee47b3497c0150762e07d3538bdc2 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Sun, 25 Jan 2015 14:09:55 +0100 Subject: Remove AddNew. If you do not want to add a new recipient, simply leave the NewAddress field empty. --- DefaultRecipient.sopm | 1 - Kernel/Modules/AdminDefaultRecipient.pm | 11 ++------- Kernel/Output/HTML/DefaultRecipient.pm | 2 +- .../Output/HTML/Standard/AdminDefaultRecipient.tt | 8 ------- Kernel/System/DefaultRecipient.pm | 28 ++++++++++------------ 5 files changed, 15 insertions(+), 35 deletions(-) diff --git a/DefaultRecipient.sopm b/DefaultRecipient.sopm index 6c8d92b..cda0aa3 100644 --- a/DefaultRecipient.sopm +++ b/DefaultRecipient.sopm @@ -24,7 +24,6 @@ - diff --git a/Kernel/Modules/AdminDefaultRecipient.pm b/Kernel/Modules/AdminDefaultRecipient.pm index 9be0cd6..7346eb1 100644 --- a/Kernel/Modules/AdminDefaultRecipient.pm +++ b/Kernel/Modules/AdminDefaultRecipient.pm @@ -74,7 +74,7 @@ sub Run { my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient'); my @NewIDs = $Self->{ParamObject}->GetArray( Param => 'IDs' ); my ( %GetParam, %Errors ); - for my $Parameter (qw(ID Title RemoveTo AddNew NewAddress Comment)) { + for my $Parameter (qw(ID Title RemoveTo NewAddress Comment)) { $GetParam{$Parameter} = $Self->{ParamObject}->GetParam( Param => $Parameter ); @@ -164,7 +164,7 @@ sub Run { my @NewIDs = $Self->{ParamObject}->GetArray( Param => 'IDs' ); my ( %GetParam, %Errors ); - for my $Parameter (qw(ID Title RemoveTo AddNew NewAddress Comment)) { + for my $Parameter (qw(ID Title RemoveTo NewAddress Comment)) { $GetParam{$Parameter} = $Self->{ParamObject}->GetParam( Param => $Parameter ); } @@ -274,12 +274,6 @@ sub _Edit { SelectedID => $Param{RemoveTo} || 0, ); - $Param{DefaultRecipientAddNewOption} = $Self->{LayoutObject}->BuildSelection( - Data => $Self->{ConfigObject}->Get('YesNoOptions'), - Name => 'AddNew', - SelectedID => $Param{AddNew} || 0, - ); - $Param{DefaultRecipientNewAddressString} = ''; $Self->{LayoutObject}->Block( @@ -340,7 +334,6 @@ sub _Overview { Name => 'OverviewResultRow', Data => { RemoveToYesNo => $YesNo{ $DefaultRecipient{RemoveTo} }, - AddNewYesNo => $YesNo{ $DefaultRecipient{AddNew} }, %DefaultRecipient, }, ); diff --git a/Kernel/Output/HTML/DefaultRecipient.pm b/Kernel/Output/HTML/DefaultRecipient.pm index 9ad424f..9b12f3b 100644 --- a/Kernel/Output/HTML/DefaultRecipient.pm +++ b/Kernel/Output/HTML/DefaultRecipient.pm @@ -71,7 +71,7 @@ sub Run { ); $RemoveTo = 1 if $DefaultRecipient{RemoveTo}; - if ( $DefaultRecipient{AddNew} ) { + if ( $DefaultRecipient{NewAddress} ne '' ) { push @Addresses, $DefaultRecipient{NewAddress}; } } diff --git a/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt b/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt index a207701..88091d7 100644 --- a/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt +++ b/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt @@ -71,7 +71,6 @@ [% Translate("Title") | html %] [% Translate("Remove 'To'") | html %] - [% Translate("Add new") | html %] [% Translate("New address") | html %] [% Translate("Comment") | html %] [% Translate("Changed") | html %] @@ -96,7 +95,6 @@ [% Data.Title | html %] [% Translate(Data.RemoveToYesNo) | html %] - [% Translate(Data.AddNewYesNo) | html %] [% Data.NewAddress | html %] [% Data.Comment | truncate(26) | html %] [% Data.ChangeTime | Localize("TimeShort") %] @@ -159,12 +157,6 @@
- -
- [% Data.DefaultRecipientAddNewOption %] -
-
-
diff --git a/Kernel/System/DefaultRecipient.pm b/Kernel/System/DefaultRecipient.pm index aae4932..82a366b 100644 --- a/Kernel/System/DefaultRecipient.pm +++ b/Kernel/System/DefaultRecipient.pm @@ -31,7 +31,7 @@ sub Add { my ( $Self, %Param ) = @_; # check needed stuff - for my $Needed (qw(Title RemoveTo AddNew NewAddress Comment UserID)) { + for my $Needed (qw(Title RemoveTo NewAddress Comment UserID)) { if ( ! defined $Param{$Needed} ) { my $LogObject = $Kernel::OM->Get('Kernel::System::Log'); $LogObject->Log( @@ -47,13 +47,12 @@ sub Add { # insert new DefaultRecipient return if !$DBObject->Do( SQL => 'INSERT INTO default_recipient ' - . '(title, remove_to, add_new, new_address, comments, ' + . '(title, remove_to, new_address, comments, ' . ' create_time, create_by, change_time, change_by) ' - . 'VALUES (?, ?, ?, ?, ?, current_timestamp, ?, current_timestamp, ?)', + . 'VALUES (?, ?, ?, ?, current_timestamp, ?, current_timestamp, ?)', Bind => [ \$Param{Title}, \$Param{RemoveTo}, - \$Param{AddNew}, \$Param{NewAddress}, \$Param{Comment}, \$Param{UserID}, @@ -87,8 +86,7 @@ sub Update { my ( $Self, %Param ) = @_; # check needed stuff - for my $Needed (qw(ID Title RemoveTo AddNew NewAddress Comment - UserID)) { + for my $Needed (qw(ID Title RemoveTo NewAddress Comment UserID)) { if ( ! defined $Param{$Needed} ) { my $LogObject = $Kernel::OM->Get('Kernel::System::Log'); $LogObject->Log( @@ -104,13 +102,12 @@ sub Update { # insert new DefaultRecipient return if !$DBObject->Do( SQL => 'UPDATE default_recipient SET title = ?, remove_to = ?, ' - . 'add_new = ?, new_address = ?, comments = ?, change_by = ?, ' + . 'new_address = ?, comments = ?, change_by = ?, ' . 'change_time = current_timestamp ' . 'WHERE id = ?', Bind => [ \$Param{Title}, \$Param{RemoveTo}, - \$Param{AddNew}, \$Param{NewAddress}, \$Param{Comment}, \$Param{UserID}, @@ -138,7 +135,7 @@ sub Get { # get RrsponseChangeDefaultTO obejct return if !$DBObject->Prepare( - SQL => 'SELECT id, title, remove_to, add_new, new_address, ' + SQL => 'SELECT id, title, remove_to, new_address, ' . 'comments, create_time, create_by, change_time, change_by ' . 'FROM default_recipient WHERE id = ?', Bind => [ \$Param{ID} ], @@ -151,13 +148,12 @@ sub Get { ID => $Data[0], Title => $Data[1], RemoveTo => $Data[2], - AddNew => $Data[3], - NewAddress => $Data[4], - Comment => $Data[5], - CreateTime => $Data[6], - CreateBy => $Data[7], - ChangeTime => $Data[8], - ChangeBy => $Data[9], + NewAddress => $Data[3], + Comment => $Data[4], + CreateTime => $Data[5], + CreateBy => $Data[6], + ChangeTime => $Data[7], + ChangeBy => $Data[8], ); } -- cgit v1.2.3-1-g7c22