diff options
Diffstat (limited to 'Kernel/Output')
| -rw-r--r-- | Kernel/Output/HTML/DefaultTo.pm (renamed from Kernel/Output/HTML/ResponseChangeDefaultTo.pm) | 39 | ||||
| -rw-r--r-- | Kernel/Output/HTML/Standard/AdminDefaultToTemplates.tt (renamed from Kernel/Output/HTML/Standard/AdminResponseChangeDefaultToTemplates.tt) | 30 |
2 files changed, 33 insertions, 36 deletions
diff --git a/Kernel/Output/HTML/ResponseChangeDefaultTo.pm b/Kernel/Output/HTML/DefaultTo.pm index b411139..1d09b40 100644 --- a/Kernel/Output/HTML/ResponseChangeDefaultTo.pm +++ b/Kernel/Output/HTML/DefaultTo.pm @@ -1,16 +1,16 @@ # -- -# Kernel/Output/HTML/ResponseChangeDefaultTo.pm +# Kernel/Output/HTML/DefaultTo.pm # Copyright (C) 2015 Alexander Sulfrian <alex@spline.inf.fu-berlin.de> # -- -package Kernel::Output::HTML::ResponseChangeDefaultTo; +package Kernel::Output::HTML::DefaultTo; use strict; use warnings; our @ObjectDependencies = qw( Kernel::System::Log - Kernel::System::ResponseChangeDefaultTo + Kernel::System::DefaultTo ); sub new { @@ -20,8 +20,7 @@ sub new { my $Self = {}; $Self->{LayoutObject} = $Param{LayoutObject} || die "Got no LayoutObject!"; $Self->{LogObject} = $Kernel::OM->Get('Kernel::System::Log'); - $Self->{ResponseChangeDefaultToObject} = - $Kernel::OM->Get('Kernel::System::ResponseChangeDefaultTo'); + $Self->{DefaultToObject} = $Kernel::OM->Get('Kernel::System::DefaultTo'); bless( $Self, $Type ); return $Self; @@ -31,7 +30,7 @@ sub Run { my ( $Self, %Param ) = @_; return if !$Self->{LayoutObject}; - for (qw(LogObject LayoutObject ResponseChangeDefaultToObject)) { + for (qw(LogObject LayoutObject DefaultToObject)) { return if !$Self->{$_}; } @@ -57,25 +56,23 @@ sub Run { } # return if not generated from template - return unless $Ticket->{ResponseID}; + return unless $Ticket->{TemplateID}; - # get all ResponseChangeDefaultTo - my %MappedResponseChangeDefaultTo = - $Self->{ResponseChangeDefaultToObject}->MappingList( - ResponseID => $Ticket->{ResponseID}, - ); + # get all DefaultTo + my %MappedDefaultTo = $Self->{DefaultToObject}->MappingList( + TemplateID => $Ticket->{TemplateID}, + ); my $RemoveDefault = 0; my @Addresses = (); - foreach my $ID ( values %MappedResponseChangeDefaultTo ) { - my %ResponseChangeDefaultTo = - $Self->{ResponseChangeDefaultToObject}->Get( - ID => $ID, - ); - - $RemoveDefault = 1 if $ResponseChangeDefaultTo{RemoveDefault}; - if ( $ResponseChangeDefaultTo{AddNew} ) { - push @Addresses, $ResponseChangeDefaultTo{NewAddress}; + foreach my $ID ( values %MappedDefaultTo ) { + my %DefaultTo = $Self->{DefaultToObject}->Get( + ID => $ID, + ); + + $RemoveDefault = 1 if $DefaultTo{RemoveDefault}; + if ( $DefaultTo{AddNew} ) { + push @Addresses, $DefaultTo{NewAddress}; } } diff --git a/Kernel/Output/HTML/Standard/AdminResponseChangeDefaultToTemplates.tt b/Kernel/Output/HTML/Standard/AdminDefaultToTemplates.tt index 090716f..e3436f7 100644 --- a/Kernel/Output/HTML/Standard/AdminResponseChangeDefaultToTemplates.tt +++ b/Kernel/Output/HTML/Standard/AdminDefaultToTemplates.tt @@ -1,5 +1,5 @@ # -- -# AdminResponseChangeDefaultToTemplates.tt - provides HTML form for AdminInterface +# AdminDefaultToTemplates.tt - provides HTML form for AdminInterface # Copyright (C) 2015 Alexander Sulfrian <alex@spline.inf.fu-berlin.de> # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see @@ -9,7 +9,7 @@ [% RenderBlockStart("Overview") %] <div class="MainBox ARIARoleMain LayoutFixedSidebar SidebarFirst"> - <h1>[% Translate("Manage Template-ResponseChangeDefaultTo Relations") | html %]</h1> + <h1>[% Translate("Manage Template-DefaultTo Relations") | html %]</h1> <div class="SidebarColumn"> @@ -51,16 +51,16 @@ </div> </div> [% RenderBlockEnd("FilterTemplate") %] -[% RenderBlockStart("FilterResponseChangeDefaultTo") %] +[% RenderBlockStart("FilterDefaultTo") %] <div class="WidgetSimple"> <div class="Header"> - <h2><label for="FilterResponseChangeDefaultTo">[% Translate("Filter for ResponseChangeDefaultTo") | html %]</label></h2> + <h2><label for="FilterDefaultTo">[% Translate("Filter for DefaultTo") | html %]</label></h2> </div> <div class="Content"> - <input type="text" id="FilterResponseChangeDefaultTo" class="FilterBox" placeholder="[% Translate("Just start typing to filter...") | html %]" name="FilterResponseChangeDefaultTo" value="" title="[% Translate("Filter for ResponseChangeDefaultTo") | html %]" /> + <input type="text" id="FilterDefaultTo" class="FilterBox" placeholder="[% Translate("Just start typing to filter...") | html %]" name="FilterDefaultTo" value="" title="[% Translate("Filter for DefaultTo") | html %]" /> </div> </div> -[% RenderBlockEnd("FilterResponseChangeDefaultTo") %] +[% RenderBlockEnd("FilterDefaultTo") %] </div> @@ -85,12 +85,12 @@ </ul> </div> <div class="Size1of2"> - <ul class="Tablelike" id="ResponseChangeDefaultTo"> - <li class="Header">[% Translate("ResponseChangeDefaultTo") | html %]</li> + <ul class="Tablelike" id="DefaultTo"> + <li class="Header">[% Translate("DefaultTo") | html %]</li> <li class="FilterMessage Hidden">[% Translate("No matches found.") | html %]</li> -[% RenderBlockStart("NoResponseChangeDefaultToFoundMsg") %] +[% RenderBlockStart("NoDefaultToFoundMsg") %] <li>[% Translate("No data found.") | html %]</li> -[% RenderBlockEnd("NoResponseChangeDefaultToFoundMsg") %] +[% RenderBlockEnd("NoDefaultToFoundMsg") %] [% RenderBlockStart("Listn1") %] <li><a href="[% Env("Baselink") %]Action=[% Env("Action") %];Subaction=[% Data.Subaction | uri %];ID=[% Data.ID | uri %]" class="AsBlock">[% Data.Name | html %]</a></li> [% RenderBlockEnd("Listn1") %] @@ -102,18 +102,18 @@ [% WRAPPER JSOnDocumentComplete %] <script type="text/javascript">//<![CDATA[ Core.UI.Table.InitTableFilter($('#FilterTemplates'), $('#Templates')); - Core.UI.Table.InitTableFilter($('#FilterResponseChangeDefaultTo'), $('#ResponseChangeDefaultTo')); + Core.UI.Table.InitTableFilter($('#FilterDefaultTo'), $('#DefaultTo')); //]]></script> [% END %] [% RenderBlockEnd("OverviewResult") %] [% RenderBlockStart("Change") %] <div class="Header"> <h2> -[% RenderBlockStart("ChangeHeaderResponseChangeDefaultTo") %] - [% Translate("Change ResponseChangeDefaultTo Relations for Template") | html %] -[% RenderBlockEnd("ChangeHeaderResponseChangeDefaultTo") %] +[% RenderBlockStart("ChangeHeaderDefaultTo") %] + [% Translate("Change DefaultTo Relations for Template") | html %] +[% RenderBlockEnd("ChangeHeaderDefaultTo") %] [% RenderBlockStart("ChangeHeaderTemplate") %] - [% Translate("Change Template Relations for ResponseChangeDefaultTo") | html %] + [% Translate("Change Template Relations for DefaultTo") | html %] [% RenderBlockEnd("ChangeHeaderTemplate") %] <a href="[% Env("Baselink") %]Action=[% Data.ActionHome | uri %];Subaction=Change;ID=[% Data.ID | uri %]">[% Data.Name | html %]</a> </h2> |