UnitedKnowledge/webgui_newsletter
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replacing active flag with status field.

Browse source
This commit is contained in:
Martin Kamerbeek 2010-05-19 18:25:14 +02:00
parent 4a9cbfd91c
commit e7dd066630
4 changed files with 11 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/Mailing/Admin.pm
View file

@ -57,7 +57,7 @@ sub www_createMailing {
my $mailing = WebGUI::Mailing->create( $session, {
assetId => $assetId,
issueId => $issueId,
active => 0,
state => 'idle',
} );
return $mailing->www_edit;
@ -119,9 +119,11 @@ sub www_view {
my @mailings;
my $it = WebGUI::Mailing->getAllIterator( $session, { sequenceKeyValue => $issueId } );
while ( my $mailing = $it->() ) {
my $state = $mailing->get('state');
push @mailings, {
%{ $mailing->get },
status => $mailing->getStatusLine,
"is$state" => 1,
sendTestUrl => $url->page('newsletter=mailing;func=sendTestEmails;id='.$mailing->getId ),
sendUrl => $url->page('newsletter=mailing;func=sendBatch;id='.$mailing->getId ),
editUrl => $url->page('newsletter=mailing;func=edit;id='.$mailing->getId ),

20
lib/WebGUI/Mailing/Email.pm
View file

@ -82,25 +82,13 @@ sub getSendableEmails {
{ 'WGMailing' => 'mailingId' },
],
constraints => [
{ 'isTest=?' => [ 0 ] },
{ 'status=?' => [ 'queued' ] },
{ 'active=?' => [ 1 ] },
{ 'sendDate <= ?' => [ time ] },
{ 'isTest=?' => [ 0 ] },
{ 'status=?' => [ 'queued' ] },
{ 'state=?' => [ 'scheduled' ] },
{ 'sendDate <= ?' => [ time ] },
],
} );
my @sql = $class->getAllSql( $session, {
joinUsing => [
{ 'WGMailing' => 'mailingId' },
],
constraints => [
{ 'isTest=?' => [ 0 ] },
{ 'status=?' => [ 'queued' ] },
{ 'active=?' => [ 1 ] },
{ 'sendDate <= ?' => [ time ] },
],
} );
$session->log->warn( "--->" . shift( @sql ) . join "\n\n", @{ shift @sql } );
return $it;
}