From 5d27169865a21084919e687a60bd2f7b3a1095fa Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Sun, 25 Jan 2015 19:37:26 +0100 Subject: Get the objects only on demand from the OM. --- Kernel/Output/HTML/DefaultRecipient.pm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Kernel/Output/HTML/DefaultRecipient.pm b/Kernel/Output/HTML/DefaultRecipient.pm index 5cdc91d..0c5b316 100644 --- a/Kernel/Output/HTML/DefaultRecipient.pm +++ b/Kernel/Output/HTML/DefaultRecipient.pm @@ -19,8 +19,6 @@ sub new { # allocate new hash for object my $Self = {}; $Self->{LayoutObject} = $Param{LayoutObject} || die "Got no LayoutObject!"; - $Self->{LogObject} = $Kernel::OM->Get('Kernel::System::Log'); - $Self->{DefaultRecipientObject} = $Kernel::OM->Get('Kernel::System::DefaultRecipient'); bless( $Self, $Type ); return $Self; @@ -30,13 +28,10 @@ sub Run { my ( $Self, %Param ) = @_; return if !$Self->{LayoutObject}; - for (qw(LogObject LayoutObject DefaultRecipientObject)) { - return if !$Self->{$_}; - } - # check needed stuff if ( !defined $Param{Data} ) { - $Self->{LogObject}->Log( + my $LogObject = $Kernel::OM->Get('Kernel::System::Log'); + $LogObject->Log( Priority => 'error', Message => 'Need Data!' ); @@ -59,7 +54,8 @@ sub Run { return unless $Ticket->{ResponseID}; # get all DefaultRecipient - my %MappedDefaultRecipient = $Self->{DefaultRecipientObject}->MappingList( + my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient'); + my %MappedDefaultRecipient = $DefaultRecipientObject->MappingList( TemplateID => $Ticket->{ResponseID}, ); @@ -68,7 +64,7 @@ sub Run { my @CcAddresses = (); my @BccAddresses = (); foreach my $ID ( values %MappedDefaultRecipient ) { - my %DefaultRecipient = $Self->{DefaultRecipientObject}->Get( + my %DefaultRecipient = $DefaultRecipientObject->Get( ID => $ID, ); -- cgit v1.2.3-1-g7c22