Change PreFilter to PostFilter

PreFilter are removed in otrs-5.0.

3 files changed, 23 insertions, 15 deletions

diff --git a/DefaultRecipient.sopm b/DefaultRecipient.sopm
index 815ccdc..88e750a 100644
--- a/DefaultRecipient.sopm
+++ b/DefaultRecipient.sopm
@@ -16,7 +16,7 @@
     <File Permission="644" Location="Kernel/Language/de_AgentDefaultRecipient.pm"/>
     <File Permission="644" Location="Kernel/Modules/AdminDefaultRecipient.pm"/>
     <File Permission="644" Location="Kernel/Modules/AdminDefaultRecipientTemplates.pm"/>
-    <File Permission="644" Location="Kernel/Output/HTML/DefaultRecipient.pm"/>
+    <File Permission="644" Location="Kernel/Output/HTML/ArticleCompose/DefaultRecipient.pm"/>
     <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/AdminDefaultRecipient.tt"/>
     <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/AdminDefaultRecipientTemplates.tt"/>
     <File Permission="644" Location="Kernel/System/DefaultRecipient.pm"/>
diff --git a/Kernel/Config/Files/DefaultRecipient.xml b/Kernel/Config/Files/DefaultRecipient.xml
index a4a0bac..b8292c8 100644
--- a/Kernel/Config/Files/DefaultRecipient.xml
+++ b/Kernel/Config/Files/DefaultRecipient.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <otrs_config version="1.0" init="Config">
-    <ConfigItem Name="Frontend::Output::FilterElementPre###DefaultRecipient" Required="0" Valid="1">
+    <ConfigItem Name="Frontend::Output::FilterElementPost###DefaultRecipient" Required="0" Valid="1">
         <Description Translatable="1">Change the default To address, based on the response template.</Description>
         <Group>Ticket</Group>
         <SubGroup>Frontend::Agent::Ticket::ViewCompose</SubGroup>
         <Setting>
             <Hash>
-                <Item Key="Module">Kernel::Output::HTML::DefaultRecipient</Item>
+                <Item Key="Module">Kernel::Output::HTML::ArticleCompose::DefaultRecipient</Item>
                 <Item Key="Templates">
                     <Hash>
                         <Item Key="AgentTicketCompose">1</Item>
diff --git a/Kernel/Output/HTML/DefaultRecipient.pm b/Kernel/Output/HTML/ArticleCompose/DefaultRecipient.pm
index 9b72bc6..aa50e49 100644
--- a/Kernel/Output/HTML/DefaultRecipient.pm
+++ b/Kernel/Output/HTML/ArticleCompose/DefaultRecipient.pm
@@ -1,16 +1,17 @@
 # --
-# Kernel/Output/HTML/DefaultRecipient.pm
+# Kernel/Output/HTML/ArticleCompose/DefaultRecipient.pm
 # Copyright (C) 2015 Alexander Sulfrian <alex@spline.inf.fu-berlin.de>
 # --
 
-package Kernel::Output::HTML::DefaultRecipient;
+package Kernel::Output::HTML::ArticleCompose::DefaultRecipient;
 
 use strict;
 use warnings;
 
 our @ObjectDependencies = qw(
-    Kernel::System::Log
+    Kernel::Output::HTML::Layout
     Kernel::System::DefaultRecipient
+    Kernel::System::Log
 );
 
 sub new {
@@ -18,7 +19,6 @@ sub new {
 
     # allocate new hash for object
     my $Self = {};
-    $Self->{LayoutObject} = $Param{LayoutObject} || die "Got no LayoutObject!";
     bless( $Self, $Type );
 
     return $Self;
@@ -26,7 +26,7 @@ sub new {
 
 sub Run {
     my ( $Self, %Param ) = @_;
-    return if !$Self->{LayoutObject};
+    my $LayoutObject = $Kernel::OM->Get('Kernel::Output::HTML::Layout');;
 
     # check needed stuff
     if ( !defined $Param{Data} ) {
@@ -35,10 +35,10 @@ sub Run {
             Priority => 'error',
             Message => 'Need Data!'
         );
-        $Self->{LayoutObject}->FatalDie();
+        $LayoutObject->FatalDie();
     }
 
-    my $BlockData = $Self->{LayoutObject}->{BlockData};
+    my $BlockData = $LayoutObject->{BlockData};
 
     # get ticket data
     my $Ticket;
@@ -51,6 +51,14 @@ sub Run {
     } 
 
     # return if not generated from template
+    unless ($Ticket->{ResponseID}) {
+        my $LogObject = $Kernel::OM->Get('Kernel::System::Log');
+        $LogObject->Log(
+            Priority => 'error',
+            Message => 'Need Data!'
+        );
+        $LayoutObject->FatalDie();
+    }
     return unless $Ticket->{ResponseID};
 
     # get all DefaultRecipient
@@ -70,7 +78,7 @@ sub Run {
 
         for my $addr (qw(To Cc Bcc)) {
             if ( $DefaultRecipient{ $addr } ne '' ) {
-                push $Addresses{ $addr }, $DefaultRecipient{ $addr };
+                push @{$Addresses{ $addr }}, $DefaultRecipient{ $addr };
             }
         }
     }
@@ -83,23 +91,23 @@ sub Run {
             }
         }
 
-        $Self->{LayoutObject}->{BlockData} = $BlockData;
+        $LayoutObject->{BlockData} = $BlockData;
     }
 
     # add new addresses
     for my $addr (qw(To Cc Bcc)) {
         for my $Address ( @{$Addresses{ $addr }} ) {
-            $Self->{LayoutObject}->AddJSOnDocumentComplete(
+            $LayoutObject->AddJSOnDocumentComplete(
                 Code => 'Core.Agent.CustomerSearch.AddTicketCustomer( '
                       . "'${addr}Customer', "
-                      . $Self->{LayoutObject}->JSONEncode( Data => $Address )
+                      . $LayoutObject->JSONEncode( Data => $Address )
                       . ' );',
             );
         }
     }
 
     # set focus to text field
-    $Self->{LayoutObject}->AddJSOnDocumentComplete(
+    $LayoutObject->AddJSOnDocumentComplete(
         Code => "\$('#RichText').focus();"
     );