oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing SendNewsletter Workflow Activity

Browse source
This commit is contained in:
Colin Kuskie 2010-01-28 10:50:34 -08:00
parent 7bb09ae30d
commit 50c3e9c6ab
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/WebGUI/Workflow/Activity/SendNewsletters.pm
View file

@ -88,7 +88,7 @@ sub execute {
# get newsletter asset
unless (defined $newsletter && $newsletter->getId eq $assetId) { # cache newsletter object
$eh->info("Getting newsletter asset $assetId");
$newsletter = WebGUI::Asset->new($self->session, $assetId);
$newsletter = WebGUI::Asset->newById($self->session, $assetId);
}
# find matching threads
@ -106,14 +106,14 @@ sub execute {
while (my ($threadId) = $matchingThreads->array) {
next
if $foundThreads{$threadId};
my $thread = WebGUI::Asset->new($self->session, $threadId);
if (defined $thread) {
my $thread = eval { WebGUI::Asset->newById($self->session, $threadId); };
if (! Exception::Class->caught()) {
$eh->info("Found thread $threadId");
push(@threads, $thread);
$foundThreads{$threadId} = 1;
}
else {
$eh->error("Couldn't instanciate thread $threadId");
$eh->error("Couldn't instanciate thread $threadId: $@");
}
}
}
@ -141,7 +141,7 @@ sub execute {
footer => $newsletter->get("newsletterFooter"),
thread_loop => \@threadLoop,
);
my $template = WebGUI::Asset->new($self->session, $newsletter->get("newsletterTemplateId"));
my $template = WebGUI::Asset->newById($self->session, $newsletter->get("newsletterTemplateId"));
my $content = $template->process(\%var);
# send newsletter