From f9f961a91ced51c1f816761c70c08fdf499331fd Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Sun, 25 Jan 2015 03:39:39 +0100 Subject: Rename RemoveDefault to RemoveTo. --- DefaultRecipient.sopm | 2 +- Kernel/Modules/AdminDefaultRecipient.pm | 14 ++++----- Kernel/Output/HTML/DefaultRecipient.pm | 6 ++-- .../Output/HTML/Standard/AdminDefaultRecipient.tt | 8 ++--- Kernel/System/DefaultRecipient.pm | 34 +++++++++++----------- 5 files changed, 31 insertions(+), 33 deletions(-) diff --git a/DefaultRecipient.sopm b/DefaultRecipient.sopm index 166ec8f..6c8d92b 100644 --- a/DefaultRecipient.sopm +++ b/DefaultRecipient.sopm @@ -23,7 +23,7 @@ - + diff --git a/Kernel/Modules/AdminDefaultRecipient.pm b/Kernel/Modules/AdminDefaultRecipient.pm index aa0a7e5..9be0cd6 100644 --- a/Kernel/Modules/AdminDefaultRecipient.pm +++ b/Kernel/Modules/AdminDefaultRecipient.pm @@ -74,8 +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 RemoveDefault AddNew NewAddress - Comment)) { + for my $Parameter (qw(ID Title RemoveTo AddNew NewAddress Comment)) { $GetParam{$Parameter} = $Self->{ParamObject}->GetParam( Param => $Parameter ); @@ -165,8 +164,7 @@ sub Run { my @NewIDs = $Self->{ParamObject}->GetArray( Param => 'IDs' ); my ( %GetParam, %Errors ); - for my $Parameter (qw(ID Title RemoveDefault AddNew NewAddress - Comment)) { + for my $Parameter (qw(ID Title RemoveTo AddNew NewAddress Comment)) { $GetParam{$Parameter} = $Self->{ParamObject}->GetParam( Param => $Parameter ); } @@ -270,10 +268,10 @@ sub _Edit { $Param{DefaultRecipientTitleString} = ''; - $Param{DefaultRecipientRemoveDefaultOption} = $Self->{LayoutObject}->BuildSelection( + $Param{DefaultRecipientRemoveToOption} = $Self->{LayoutObject}->BuildSelection( Data => $Self->{ConfigObject}->Get('YesNoOptions'), - Name => 'RemoveDefault', - SelectedID => $Param{RemoveDefault} || 0, + Name => 'RemoveTo', + SelectedID => $Param{RemoveTo} || 0, ); $Param{DefaultRecipientAddNewOption} = $Self->{LayoutObject}->BuildSelection( @@ -341,7 +339,7 @@ sub _Overview { $Self->{LayoutObject}->Block( Name => 'OverviewResultRow', Data => { - RemoveDefaultYesNo => $YesNo{ $DefaultRecipient{RemoveDefault} }, + RemoveToYesNo => $YesNo{ $DefaultRecipient{RemoveTo} }, AddNewYesNo => $YesNo{ $DefaultRecipient{AddNew} }, %DefaultRecipient, }, diff --git a/Kernel/Output/HTML/DefaultRecipient.pm b/Kernel/Output/HTML/DefaultRecipient.pm index 5d94c4a..9ad424f 100644 --- a/Kernel/Output/HTML/DefaultRecipient.pm +++ b/Kernel/Output/HTML/DefaultRecipient.pm @@ -63,20 +63,20 @@ sub Run { TemplateID => $Ticket->{TemplateID}, ); - my $RemoveDefault = 0; + my $RemoveTo = 0; my @Addresses = (); foreach my $ID ( values %MappedDefaultRecipient ) { my %DefaultRecipient = $Self->{DefaultRecipientObject}->Get( ID => $ID, ); - $RemoveDefault = 1 if $DefaultRecipient{RemoveDefault}; + $RemoveTo = 1 if $DefaultRecipient{RemoveTo}; if ( $DefaultRecipient{AddNew} ) { push @Addresses, $DefaultRecipient{NewAddress}; } } - if ( $RemoveDefault ) { + if ( $RemoveTo ) { # remove preselected "To" address for my $block ( @$BlockData ) { if ( $block->{Name} eq 'PreFilledToRow' ) { diff --git a/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt b/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt index e2447d1..a207701 100644 --- a/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt +++ b/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt @@ -70,7 +70,7 @@ [% Translate("Title") | html %] - [% Translate("Remove default") | html %] + [% Translate("Remove 'To'") | html %] [% Translate("Add new") | html %] [% Translate("New address") | html %] [% Translate("Comment") | html %] @@ -95,7 +95,7 @@ [% Data.Title | html %] - [% Translate(Data.RemoveDefaultYesNo) | html %] + [% Translate(Data.RemoveToYesNo) | html %] [% Translate(Data.AddNewYesNo) | html %] [% Data.NewAddress | html %] [% Data.Comment | truncate(26) | html %] @@ -153,9 +153,9 @@
- +
- [% Data.DefaultRecipientRemoveDefaultOption %] + [% Data.DefaultRecipientRemoveToOption %]
diff --git a/Kernel/System/DefaultRecipient.pm b/Kernel/System/DefaultRecipient.pm index b8eb26c..aae4932 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 RemoveDefault AddNew NewAddress Comment UserID)) { + for my $Needed (qw(Title RemoveTo AddNew NewAddress Comment UserID)) { if ( ! defined $Param{$Needed} ) { my $LogObject = $Kernel::OM->Get('Kernel::System::Log'); $LogObject->Log( @@ -47,12 +47,12 @@ sub Add { # insert new DefaultRecipient return if !$DBObject->Do( SQL => 'INSERT INTO default_recipient ' - . '(title, remove_default, add_new, new_address, comments, ' + . '(title, remove_to, add_new, new_address, comments, ' . ' create_time, create_by, change_time, change_by) ' . 'VALUES (?, ?, ?, ?, ?, current_timestamp, ?, current_timestamp, ?)', Bind => [ \$Param{Title}, - \$Param{RemoveDefault}, + \$Param{RemoveTo}, \$Param{AddNew}, \$Param{NewAddress}, \$Param{Comment}, @@ -87,7 +87,7 @@ sub Update { my ( $Self, %Param ) = @_; # check needed stuff - for my $Needed (qw(ID Title RemoveDefault AddNew NewAddress Comment + for my $Needed (qw(ID Title RemoveTo AddNew NewAddress Comment UserID)) { if ( ! defined $Param{$Needed} ) { my $LogObject = $Kernel::OM->Get('Kernel::System::Log'); @@ -103,13 +103,13 @@ sub Update { # insert new DefaultRecipient return if !$DBObject->Do( - SQL => 'UPDATE default_recipient SET title = ?, remove_default = ?, ' + SQL => 'UPDATE default_recipient SET title = ?, remove_to = ?, ' . 'add_new = ?, new_address = ?, comments = ?, change_by = ?, ' . 'change_time = current_timestamp ' . 'WHERE id = ?', Bind => [ \$Param{Title}, - \$Param{RemoveDefault}, + \$Param{RemoveTo}, \$Param{AddNew}, \$Param{NewAddress}, \$Param{Comment}, @@ -138,7 +138,7 @@ sub Get { # get RrsponseChangeDefaultTO obejct return if !$DBObject->Prepare( - SQL => 'SELECT id, title, remove_default, add_new, new_address, ' + SQL => 'SELECT id, title, remove_to, add_new, new_address, ' . 'comments, create_time, create_by, change_time, change_by ' . 'FROM default_recipient WHERE id = ?', Bind => [ \$Param{ID} ], @@ -148,16 +148,16 @@ sub Get { my %DefaultRecipient; while ( my @Data = $DBObject->FetchrowArray() ) { %DefaultRecipient = ( - ID => $Data[0], - Title => $Data[1], - RemoveDefault => $Data[2], - AddNew => $Data[3], - NewAddress => $Data[4], - Comment => $Data[5], - CreateTime => $Data[6], - CreateBy => $Data[7], - ChangeTime => $Data[8], - ChangeBy => $Data[9], + 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], ); } -- cgit v1.2.3-1-g7c22