Replacing active flag with status field.

lib/WebGUI/Mailing.pm

@@ -33,9 +33,9 @@ sub crud_definition {
         sendDate        => {
             fieldType       => 'dateTime',
         },
-        active          => {
+        state           => {
-            fieldType       => 'yesNo',
+            fieldType       => 'text',
-            defaultValue    => 0,
+            defaultValue    => 'idle',
         },
     );
 
@@ -285,7 +285,7 @@ sub www_sendBatchConfirm {
     $self->queueEmails( $userIds );
     $self->update( {
         sendDate    => $scheduled,
-        active      => 1,
+        state       => 'scheduled',
     } );
 
     return WebGUI::Mailing::Admin->new( $session )->www_view;

lib/WebGUI/Mailing/Admin.pm

@@ -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            ),

lib/WebGUI/Mailing/Email.pm

@@ -84,23 +84,11 @@ sub getSendableEmails {
         constraints => [
             { 'isTest=?'        => [ 0           ] },
             { 'status=?'        => [ 'queued'    ] },
-            { 'active=?'        => [ 1          ] },
+            { '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;
 }