From 169d750b0e00f48f076638e73c4fc42076c17923 Mon Sep 17 00:00:00 2001 From: Martin Kamerbeek Date: Thu, 3 Jun 2010 10:51:07 +0200 Subject: [PATCH] Make mailing manager template settable en change namespace to Mailing/Manage. --- lib/WebGUI/Mailing/Admin.pm | 19 +++++++++---- lib/WebGUI/i18n/Dutch/MailingManager.pm | 5 ++++ lib/WebGUI/i18n/English/MailingManager.pm | 5 ++++ sbin/install_newsletter.pl | 26 ++++++++++++++++-- .../root_import_personalnewsletter.wgpkg | Bin 3712 -> 3694 bytes 5 files changed, 48 insertions(+), 7 deletions(-) diff --git a/lib/WebGUI/Mailing/Admin.pm b/lib/WebGUI/Mailing/Admin.pm index 3f15e62..a05fe03 100644 --- a/lib/WebGUI/Mailing/Admin.pm +++ b/lib/WebGUI/Mailing/Admin.pm @@ -91,12 +91,19 @@ sub www_settings { $f->text( name => 'newsletterReturnDomain', value => $setting->get( 'newsletterReturnDomain' ), - label => $i18n->get( 'Newsletter domain name' ), + label => $i18n->get( 'newsletter domain name' ), ); $f->integer( name => 'newsletterBounceScoreThreshold', value => $setting->get( 'newsletterBounceScoreThreshold' ), - label => $i18n->get( 'Bounce score threshold' ), + label => $i18n->get( 'bounce score threshold' ), + ); + $f->template( + name => 'mailingManagerTemplateId', + value => $setting->get( 'mailingManagerTemplateId' ), + defaultValue => 'FTfNhWI8KJOwLzFUl5rYeQ', + label => $i18n->get( 'manage mailings template' ), + namespace => 'Mailing/Manage', ); $f->submit; @@ -111,8 +118,9 @@ sub www_settingsSave { my ($setting, $form) = $session->quick( 'setting', 'form' ); - $setting->set( 'newsletterReturnDomain', $form->get('newsletterReturnDomain') ); - $setting->set( 'newsletterBounceScoreThreshold', $form->integer('newsletterBounceScoreThreshold') ); + $setting->set( 'newsletterReturnDomain', $form->get('newsletterReturnDomain') ); + $setting->set( 'newsletterBounceScoreThreshold', $form->integer('newsletterBounceScoreThreshold') ); + $setting->set( 'mailingManagerTemplateId', $form->template('mailingManagerTemplateId') ); return $self->www_settings; } @@ -122,6 +130,7 @@ sub www_view { my $self = shift; my $session = $self->session; my $url = $session->url; + my $setting = $session->setting; my $i18n = WebGUI::International->new( $session, 'MailingManager' ); return $self->www_settings unless $self->configurationComplete; @@ -162,7 +171,7 @@ sub www_view { my $var = { newsletter_loop => \@newsletterLoop }; - my $template = WebGUI::Asset::Template->new( $self->session, 'FTfNhWI8KJOwLzFUl5rYeQ' ); + my $template = WebGUI::Asset::Template->new( $session, $setting->get('mailingManagerTemplateId') ); return $self->getAdminConsole->render( $template->process( $var ), $i18n->get( 'manage mailings' ) ); } diff --git a/lib/WebGUI/i18n/Dutch/MailingManager.pm b/lib/WebGUI/i18n/Dutch/MailingManager.pm index 005fb5c..582dff7 100644 --- a/lib/WebGUI/i18n/Dutch/MailingManager.pm +++ b/lib/WebGUI/i18n/Dutch/MailingManager.pm @@ -82,6 +82,11 @@ our $I18N = { 'cancel mailing failure' => { message => 'De mailing kan niet afgebroken worden. Dit kan voorkomen als de mailing geplanned stond om verzonden te worden vlak voor het moment waarop deze afgebroken werd.', }, + + 'manage mailings template' => { + message => 'Mailing beheer sjabloon', + }, + }; 1; diff --git a/lib/WebGUI/i18n/English/MailingManager.pm b/lib/WebGUI/i18n/English/MailingManager.pm index 18fb565..fee900d 100644 --- a/lib/WebGUI/i18n/English/MailingManager.pm +++ b/lib/WebGUI/i18n/English/MailingManager.pm @@ -82,6 +82,11 @@ our $I18N = { 'cancel mailing failure' => { message => 'The mailing could not be canceled. This can happen when the mailing has been scheduled just before it was canceled.', }, + + 'manage mailings template' => { + message => 'Manage mailings template', + }, + }; 1; diff --git a/sbin/install_newsletter.pl b/sbin/install_newsletter.pl index 896a920..b7f8bf4 100644 --- a/sbin/install_newsletter.pl +++ b/sbin/install_newsletter.pl @@ -30,6 +30,7 @@ installNewsletterSettings( $session ); addPluginsToConfigFile( $session ); addTemplateColumnToNewsletterCollection( $session ); addRecentColumnToNewsletterCollection( $session ); +renamespaceTemplates( $session ); finish($session); @@ -185,8 +186,14 @@ sub installNewsletterSettings { print "\tInstalling newsletter setting slots..."; - $setting->add( 'newsletterReturnDomain', undef ) unless $setting->has( 'newsletterReturnDomain' ); - $setting->add( 'newsletterBounceScoreThreshold', 0 ) unless $setting->has( 'newsletterBounceScoreThreshold' ); + $setting->add( 'newsletterReturnDomain', undef ) + unless $setting->has( 'newsletterReturnDomain' ); + + $setting->add( 'newsletterBounceScoreThreshold', 0 ) + unless $setting->has( 'newsletterBounceScoreThreshold' ); + + $setting->add( 'mailingManagerTemplateId', 'FTfNhWI8KJOwLzFUl5rYeQ' ) + unless $setting->has( 'mailingManagerTemplateId' ); print "Done.\n"; } @@ -218,6 +225,21 @@ sub addPluginsToConfigFile { print "Done.\n"; } +#---------------------------------------------------------------------------- +sub renamespaceTemplates { + my $session = shift; + my $db = $session->db; + + print "\tRenamespacing templates..."; + + $db->write( 'update template set namespace=? where namespace=?', [ + 'Mailing/Manage', + 'NLAdmin/Manage', + ] ); + + print "Done.\n"; +} + #---------------------------------------------------------------------------- sub start { my $webguiRoot = shift; diff --git a/sbin/packages/root_import_personalnewsletter.wgpkg b/sbin/packages/root_import_personalnewsletter.wgpkg index 6ba7a9d2f544530c139a4149928e568b9cd99b74..e7ddbd654120c1c4639976b484c38efd0fe0b46b 100644 GIT binary patch delta 3684 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 delta 3702 zcmV-+4vF#Z9Dp5vABzY8000000RQb=dvoGA63^fJDRgXY)m_yPaDX^uxl|>Y$zvz) z=VUi~DT4(lF}7pbkYsDV`?VgnWUvWj0<*IPQxmW)wOTEy``4|OmzQS$DVNJ;t+upO zE*oa8tiDn5DK8mDwQSVNE2}HzC1e;z%~(QEW%i$lhE@Q7to5uQByN6tuRVuO!iRN^ zee&u2&7N>>4gK%(J@v-O;SKx)_0?)sje9%~9HwfxG zRQc;C7=;22y};_=0$N9Z{P}_3@&nJuup}^LcX=^Z(k9e*tmg|7I=pznDDd*^nPbuL z)06K7A+|Svc{Mk3oaAvUz!p5&dS(O*6;%&bU?_fA3 zAgq;tu`z80#1Dzb`;!`)7EB|0Wc7puu5oksa({h&lSy%X{n~5Z;}-nb@f_CYWO6yg z#c~E0bZsVnt8#p2r9Lj>LH;A9$Qgj6{iMH7cHM>^}1QF*US}-!2q*K>A4@{6`v(wSOu_ZlhIU- zM-+?o9ItNPj7C0ueX8msiQQK4?1v{AO@&rR&iCE=OY!>jxOHZp?76K^4-P&1ynm{H zm|_cX)A74j6NfM?jwAG&#ucIG&lFf2=9W;QEv@FLF6DxX#jL9zu0>yypwCxbvS9gm zCX1E-&=$EL5I1BzOgJL}ofVjg`1;e=?_jVNO}?uHMs=mQ^PVUWD2~B@hGCj3L-?;+ zt(Xh^_pSq-LrmbmSa050VF+je%t*+8Z9@zOC&!2L#egXomjm@C!--rszcU6bDL7c{ zSuR+aplIW^6*-|YA6z#}O}%r`KI&fYuYLaQcyREtbLrHA8?2d{H^9Sj=q?_0-uDK_ zdWb>K|K1itkZh?%>1|~9=l{xo9)4wi z8YNDW6X4g}$RJ_^{e+%ufKh9N0WZsbvri-JZX6LD4QMkUxZNnhb=-3DJnHpukojn{ z1jNl)ri66-Q1NyU3vZknx0nq~rk4X%0AW5Wz zSPJcg8BHd)`**u6hc7G)_|Ayy_-^yg$1g$sLV5pXv;Qnnp`46Y)^0qTj{ z+4MvYNINc-7A<3yeRAeTb3-;s*BhlK7v3}OmN9rx=pR5Lx$?c zG|st~ur6t_Im|)+#`19UafPItfO)~|v?B+r=@l2!zprrcf?eANZ=|=5{`c|Uw}oF` z&@aE=7Cxv!r%-}<3>*Jj;o3#7um8>-?3U%Wup@+sCbRlC0isbm1lJJvMX+8Wg8sp50EY+&!TD7hP zS0;)qsfZFf6rd7)90rxI#fc#D0IMh~?l2VkG1Jk1z%enSbm(akCLu@x0agw^hoXG( zP^_=-T^t_7S4z}lf>4CU!eHT0EeN9z4{vkA=+wv{y*)ZbyWU{m-SL8+2)t=gTo>Y< zfGb-f;&ybfY4?a*6634-JuY4)XRmUC3b}|rh35ZCgZOm@;lIYvy^#ai88Xg-=lq_6 zA(2?sf(9tZWZFmz^l&Cswq3N#~NA8@JyRT@GTcSn#h zbSMiEOI;?41I4$aUsgBUs6+zy>j*c;NKX!FMK6aTtS~ZQYtk4MF+i$GD+NItU{-RW zWzvieA*aPqd7aJ2f^t;AN@)y8Z16PTAL>Qcktk5z&~6 z;{lL1HhiUv5sKZBh=MN&GfI}?7=Z&3tr}mu3}mDWC99d;9|9C=2cWWfv$l5lxO-(j z{eFE}>25u?-Ckz&-}m++{wwkX_}XAm4YkO=IR~I5gT2L;=e9}E<6E}H06#_~7};)>Az<4GPosYE z*f|+=URF=sgVtlQyQ!F(X$aWgIPReyfp}{~9>A4Fea{OXJb?D7&+kSG6&@%dHK{AzphfxS5*RA8;G!U)34VgKhWGa`tBL{Lftk#|tX6A(mAavs zjfwnA=|3TT(xTBx`(7?)y0e!K?p~g+eR14+@$>a%8{c>--9BR+$)=f6)$*0z4@bT) zDp^pQmjrU~e`UV--x$gNDAyK$`5*I`0}K2=2mJ4PMS+w(x5!bjvJQIs$LU&V+Lw=q z59Qj&m7e)qv(u?=ovN}k#r`}L0>M3q76f;Mp5ad9SYlIV3xGY=_JDa2aA;`A(sVb5 zpRlbC{@??L-<&XZsMtZ=#gJbF)b?PFiU2lICd&}Z0- zK(HslHZs5)vMl)Kdlrm8NU%!pi>${^L{>_&oFZ}`d@I>ZVVejnh$vqYvJ}NXqkim zYjec^tE*LWB>rE4*T9q&o3r~Bfhn8C`(J*j_kYAE0T<^#wFvLG=l`gKg^&W|IPl^M zh*^(60&3k{-R$^Y+q&uZ&ThQDfm3;^rnKeMZwQeG=_M}*UeZgeNCo4Z-3{$De9Km268U7QZ zoYBHyxY*cXBaW&bHxz-(&7gvAM`Sc2k8j;1bC{U8!MW~pskB{PY?p=PwV zAgg2c?iwjTB|Poul%O$QB+2M#VqyHU4@a3Ss9@;oEnnTC3 zlCxfa>BZFG(@%qU-({anJ5)8jt6GCYS!R9OeKPIH)2ISe@^~+Ab;VdSG^+dvAJ^ie zuk%SK&P~YYkKwS64AmSQRwY0+&T1s4+$x);$z|@_x7k`1TFWxBN{uAORq2964WK)>Y@X$4WaDL!Wh$<(gSr(X*}>;fC3H?+eNi U3kfVF@C_39KdqR3>i}8+0H&BMMgRZ+