From 37f18efd3d3195395d029b25a20fda472691cbe9 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Sun, 25 Jan 2015 14:57:34 +0100 Subject: Rename NewAddress to AddTo. --- DefaultRecipient.sopm | 2 +- Kernel/Modules/AdminDefaultRecipient.pm | 4 ++-- Kernel/Output/HTML/DefaultRecipient.pm | 4 ++-- Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt | 8 ++++---- Kernel/System/DefaultRecipient.pm | 16 ++++++++-------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/DefaultRecipient.sopm b/DefaultRecipient.sopm index cda0aa3..5f3a160 100644 --- a/DefaultRecipient.sopm +++ b/DefaultRecipient.sopm @@ -24,7 +24,7 @@ - + diff --git a/Kernel/Modules/AdminDefaultRecipient.pm b/Kernel/Modules/AdminDefaultRecipient.pm index f27f29e..df730ee 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 NewAddress Comment)) { + for my $Parameter (qw(ID Title RemoveTo AddTo 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 NewAddress Comment)) { + for my $Parameter (qw(ID Title RemoveTo AddTo Comment)) { $GetParam{$Parameter} = $Self->{ParamObject}->GetParam( Param => $Parameter ); } diff --git a/Kernel/Output/HTML/DefaultRecipient.pm b/Kernel/Output/HTML/DefaultRecipient.pm index 9b12f3b..775abb2 100644 --- a/Kernel/Output/HTML/DefaultRecipient.pm +++ b/Kernel/Output/HTML/DefaultRecipient.pm @@ -71,8 +71,8 @@ sub Run { ); $RemoveTo = 1 if $DefaultRecipient{RemoveTo}; - if ( $DefaultRecipient{NewAddress} ne '' ) { - push @Addresses, $DefaultRecipient{NewAddress}; + if ( $DefaultRecipient{AddTo} ne '' ) { + push @Addresses, $DefaultRecipient{AddTo}; } } diff --git a/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt b/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt index 88091d7..03ec6a3 100644 --- a/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt +++ b/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt @@ -71,7 +71,7 @@ [% Translate("Title") | html %] [% Translate("Remove 'To'") | html %] - [% Translate("New address") | html %] + [% Translate("New 'To'") | html %] [% Translate("Comment") | html %] [% Translate("Changed") | html %] [% Translate("Created") | html %] @@ -95,7 +95,7 @@ [% Data.Title | html %] [% Translate(Data.RemoveToYesNo) | html %] - [% Data.NewAddress | html %] + [% Data.AddTo | html %] [% Data.Comment | truncate(26) | html %] [% Data.ChangeTime | Localize("TimeShort") %] [% Data.CreateTime | Localize("TimeShort") %] @@ -157,9 +157,9 @@
- +
- +
diff --git a/Kernel/System/DefaultRecipient.pm b/Kernel/System/DefaultRecipient.pm index 82a366b..d570dca 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 NewAddress Comment UserID)) { + for my $Needed (qw(Title RemoveTo AddTo Comment UserID)) { if ( ! defined $Param{$Needed} ) { my $LogObject = $Kernel::OM->Get('Kernel::System::Log'); $LogObject->Log( @@ -47,13 +47,13 @@ sub Add { # insert new DefaultRecipient return if !$DBObject->Do( SQL => 'INSERT INTO default_recipient ' - . '(title, remove_to, new_address, comments, ' + . '(title, remove_to, add_to, comments, ' . ' create_time, create_by, change_time, change_by) ' . 'VALUES (?, ?, ?, ?, current_timestamp, ?, current_timestamp, ?)', Bind => [ \$Param{Title}, \$Param{RemoveTo}, - \$Param{NewAddress}, + \$Param{AddTo}, \$Param{Comment}, \$Param{UserID}, \$Param{UserID}, @@ -86,7 +86,7 @@ sub Update { my ( $Self, %Param ) = @_; # check needed stuff - for my $Needed (qw(ID Title RemoveTo NewAddress Comment UserID)) { + for my $Needed (qw(ID Title RemoveTo AddTo Comment UserID)) { if ( ! defined $Param{$Needed} ) { my $LogObject = $Kernel::OM->Get('Kernel::System::Log'); $LogObject->Log( @@ -102,13 +102,13 @@ sub Update { # insert new DefaultRecipient return if !$DBObject->Do( SQL => 'UPDATE default_recipient SET title = ?, remove_to = ?, ' - . 'new_address = ?, comments = ?, change_by = ?, ' + . 'add_to = ?, comments = ?, change_by = ?, ' . 'change_time = current_timestamp ' . 'WHERE id = ?', Bind => [ \$Param{Title}, \$Param{RemoveTo}, - \$Param{NewAddress}, + \$Param{AddTo}, \$Param{Comment}, \$Param{UserID}, \$Param{ID}, @@ -135,7 +135,7 @@ sub Get { # get RrsponseChangeDefaultTO obejct return if !$DBObject->Prepare( - SQL => 'SELECT id, title, remove_to, new_address, ' + SQL => 'SELECT id, title, remove_to, add_to, ' . 'comments, create_time, create_by, change_time, change_by ' . 'FROM default_recipient WHERE id = ?', Bind => [ \$Param{ID} ], @@ -148,7 +148,7 @@ sub Get { ID => $Data[0], Title => $Data[1], RemoveTo => $Data[2], - NewAddress => $Data[3], + AddTo => $Data[3], Comment => $Data[4], CreateTime => $Data[5], CreateBy => $Data[6], -- cgit v1.2.3-1-g7c22