From e7dd066630d80d4ac926c364d645749187017cc1 Mon Sep 17 00:00:00 2001 From: Martin Kamerbeek Date: Wed, 19 May 2010 18:25:14 +0200 Subject: [PATCH] Replacing active flag with status field. --- lib/WebGUI/Mailing.pm | 8 +++---- lib/WebGUI/Mailing/Admin.pm | 4 +++- lib/WebGUI/Mailing/Email.pm | 20 ++++-------------- .../root_import_personalnewsletter.wgpkg | Bin 1904 -> 1930 bytes 4 files changed, 11 insertions(+), 21 deletions(-) diff --git a/lib/WebGUI/Mailing.pm b/lib/WebGUI/Mailing.pm index cb96cd4..8125582 100644 --- a/lib/WebGUI/Mailing.pm +++ b/lib/WebGUI/Mailing.pm @@ -33,9 +33,9 @@ sub crud_definition { sendDate => { fieldType => 'dateTime', }, - active => { - fieldType => 'yesNo', - defaultValue => 0, + state => { + fieldType => 'text', + 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; diff --git a/lib/WebGUI/Mailing/Admin.pm b/lib/WebGUI/Mailing/Admin.pm index 1e61d5c..793508c 100644 --- a/lib/WebGUI/Mailing/Admin.pm +++ b/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 ), diff --git a/lib/WebGUI/Mailing/Email.pm b/lib/WebGUI/Mailing/Email.pm index 02d01e7..0b05410 100644 --- a/lib/WebGUI/Mailing/Email.pm +++ b/lib/WebGUI/Mailing/Email.pm @@ -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; } diff --git a/sbin/packages/root_import_personalnewsletter.wgpkg b/sbin/packages/root_import_personalnewsletter.wgpkg index 4940c61b94284c24b34392a4332bfaa4769cf558..838af0e72239ba981700c88ae731cc4ae8a4ac64 100644 GIT binary patch literal 1930 zcmV;52X*)#iwFP!00000|Ls{@Z`(E$&U1f-=DlpdT-)(2_PhXTmNZ^-aS~_g&=dhJ zF*Xz3KvHp>BL97dq$EK?ZUK7DgkNunBf_r;n$X#CL+JoK@8wY~}|cBa7?c2TsueM$Qn8 z*#Oyh00%2(WXX(?$XE2r*Wkg_$Mk|>+Lv=pX(Q^&2{Z_Jg?K{U3Rnt~2Du^VgB);2W)<1-fzu?H^a zIM!kCj>EUyG15OR1CRIKhtEDFGiAwl=xi8ux3O8J1dDJ;_1!P4>+)1mwZtREbf)6 ztq*^lOb;LTFWe^m z2OCGtGw9(mc9(cv>fV!F&l1%0kE;>~%T{d0u1ed&C_npdtboNG>x*cD1Hif$7X&!+ z%E%>SANVH^!rw*bllarCNJt4FzvUrg5eM*7ym$eD*5g!;74PEd@yYfv!O@hBD8VLAq+3yE=(9d7qV)T*Rwq@$2Eq4*|)3pWh`_{kdKJ92wxeePAzS4_vi z=z)bN5K~NJh>Q^{+)0HoY$A1FLoV?=V zOFV|JV_mY|Hb%N+ZmvQ|Fhppp>%_vc*@5H+Qso>jqfX>v9d*ed^Y<4k9cTSI?=Ev- zzIklq+t`f_q&~EH%<0KH#Fq$eaz6&Ca$CjxdxKQesZ)MBgBCnf67x-9>~xD0VxjOY*!lPqJ8e5)urR=fqgP! zw7R+XIBR_1gW&RX_;ISYtM5`6?zCEZ#Y|y%)&EAN<#u@-R9}m}1vRwS=2r{6THw_J Q|3?e_3no^##Q-J%0OT*LI{*Lx literal 1904 zcmV-$2aot4iwFP!00000|Ls{@Q`yn)OYz__gf+`U#5q4pY9o0xQ%Qk0=`B zn$@>He)>%|#WadBgal@yRSpv)J;GuiJq!u=^um-T1(G^2;>SZPDVaq6YS~E5Kk{i=tWaG%hnz2A&g>1=GVdZoT7b!5{T_KKvNJj$OmDWk2%Lw zLm|d6Phsf&?*6-AZ|COz6#0MOowU!df{n2rOW1%$JmL?r(uc8K!uE;h;ZUw^D4oIj zAE*Z_3axIRz0qiQgb^_88{|&#kOVkNxE$2#+6M5LMoE0&?RrG@HrF)*;}1R_;s8v} zak_`W4u@}fV&s3i1|A6~m=bO8W-cW$Cz0Gw!89(o5j#eK(!d2C zy*oeX_qT->`~8b(bc0=Z*^7L!=iIq`65`Z@YvyUD-t{=?Yi}kf9G7{b@Zh7!BiBUv zOs%=zYi_n%8@&w;kt*yjf|XD9bQjOVVvu^oafwF+(TMo?>t?9@;Uv3_U9oOIbU@>!Xn)#>OR5_TAgh*D8pFr2Ac>1Ugpz0J)| zZ`}}(V&Rlg_%@69G6h2vK-A{e)Qcw!t9Z_$TP|b3^X0B;S`vpYeTey>WGRluslUJ5 z{9L~{`QV=R2K%AAd+W2)_Xj6hC=r0$emp@V%)uG72En(`kM5Fn$ zR4OV{vw8f;Q*@aIV;OaMz)E}O!75*jAde{txsYK+j|6sB6Di{H)#GW%JFNhF;eWu~vUBqaaSm(&(g>HiAtQsU^TTh; z0Sh#)g6gft6Xn_b%p90muTA!Hd^_wY4Je6G`nJe$*#dT)4rJh?d7c>m{z>EY+S zbH79X!A7ci0zF*B?lP;(y*rZYS%P~0aS0A_&l@gdm$faSl%GRC-GIeC>x*cD1Yq5X z3j(CPI`YXl1pdjR_;=CyDE>GN2`K^Ow@fk?@c=)^OBWDm4ySUgco&buCtJq^CsQ_} z1YbK1_|8_&`;#ERw6ts6h09B!2R`%)j$pA@eiX%)Hk16$7nv8xvuHGBF$!S|3g8Y= zi!hepH&GJuEn_=!4{{q~Au&#}!!2h-twz2^J_=bAimwZ}aMKWgAFUC-B{#R$C#Qk_ z$8-#g9$0t=F~u~6C@8VPy<8YWCvs1->JS@ALLW0`U0v-RoSqG@u8hfsavM^+YHU72 z8O_^rO7?09s}-9nOzheeGs7|WA=*A#Wyq-(l@5gltxu~>RQJ^*MBr{QP8B)Ea4*D| zT7hcTc+OAtx)36J%7tM#^oE#ac7Xt5JW0ScpiN_C7~;1YClx8f(9`Sng31MolYk#U zOkQ&FB_6}p>0XM~Hb(knX0AfWFobKX>%`o$#ewA7LJ*X9xN@8r|BH17_f;?Pv1k1{ zYpD!S{FZCRMWKuRR5$8FYsQ?Oy(>jvpDh-vd^HclbswjzsgK30RSRxJfOyp~mt6eI z#H|L1#hn39Q(@9G0}JDtSSC*PUcR^0d{s%8Nmz|E2H)c1w58MeD%FpL6^>zgh1HOY zOB;%=>(S;de7@9HR^Vu_Z>)EFT@A5PfkPKItRuy3thck=W?8ucF2LaFW!K-C3WU93 zR=gIKE{YY9RfL4QGSvAb2bw81Wv1x&_lHM^*_YPSf?5b+nKDFG&Zq^L=8L43evS{fy?}%bWnaDTMP-xJdo>rYRT9ersr*vp zl6}D>A2SB&R4_+D(8^e%Y}3q8d}=l*gWSk|v+PfSuEO-@h>B!(i%3Wrl`9=@Bm*%= zb2kgb2L`3dt3lLM>l{Io8!8YoM?gH0go(N3r+lKgrb)D_aAYgv@~pjJ;?g9YCO}BW zGWDjPG9Sv+s=QO&vx;50zl!#ml&MRtJ6$%8>eN0xI-TwxZJgZh4E{|D_up?&NZsrj qsjyH;UG~2>d3jnM?Dk8Mw4&tp()^-<7Y+Ov8u$;p0PG(CBme+u)1!I-