From f5fd970c947f6ce4339d6d666b0bc5b05880c5ff Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 22 Mar 2010 15:25:44 -0700 Subject: [PATCH] Allow users who re-edit posts to skip notifications. Fixes bug #11466 --- docs/changelog/7.x.x.txt | 1 + .../packages-7.9.1/default_post_form.wgpkg | Bin 0 -> 1815 bytes lib/WebGUI/Asset/Post.pm | 7 +++++++ lib/WebGUI/Help/Asset_Post.pm | 1 + lib/WebGUI/i18n/English/Asset_Post.pm | 10 ++++++++++ 5 files changed, 19 insertions(+) create mode 100644 docs/upgrades/packages-7.9.1/default_post_form.wgpkg diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 3020f5655..9119fc078 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -9,6 +9,7 @@ - fixed thread pagination on search results, off by 1 error and modal direction - fixed #11482: Template hard-coded in deactivateAccount - fixed #11485: RedirectAfterLoginUrl Setting should not override returnUrl and redirectAfterLogin scratch + - fixed #11466: Can't delete attached file in CS 7.9.0 - added #11383: AJAX username checks at registration (Luke Robinson / Orchard Solutions) diff --git a/docs/upgrades/packages-7.9.1/default_post_form.wgpkg b/docs/upgrades/packages-7.9.1/default_post_form.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..ca4ada625f4457913e39ed5d51095c3bfab98d97 GIT binary patch literal 1815 zcmV+y2k7`8iwFP!00000|Ls_9Z`(Ey_UHZz!Jjr@b!;b&W7ji~rZ3LWW?qxF1LiHD zZ8~NnOM*zp^@{xW-5p7hdT|tH-U(IH-+wIh9&1S3HY2t6Q zb#PFt1=-cCwOad~R`;;8-|W_cR;$@Qs0Fa(@vpU1ECrKhaVVne-TKy&r*bzLoq~&; zqu)DN|4$^cy5;>p!u!^K+RB_6#xc@3i;oz^2EWKzBUn#3tkk7-S`4#SKLRj5dQJy}mfA(wpa)<%5uSw!=ALqeO5 zAh%JRNKqEYzp9jtIGbOvD>-JfYY>M94W!zJJW$(&|2zS=zpA~Nl#}{Uv1!N~bG~5f zP>o}$-o)uDQ1fq#I8x6SY$d{NpQVC@FX)XFfAfAXQ7>+n?FydT!5(QEI$PsS#M6(^ zMNYLTUTkvK-fib3+GXh^`ZkFss%&reHnVvW-A4jnuBq_fUeA7@ug&aw0 zkPHXYp_82F80-OUF9FWM9w`@#YJoG@UQlhB$jnkJ&oWd>Tedw5R$NLb(#8_DJx?1U zoAMBh03PQG#sG6*n9x4jPr(f8Q$j!r6#$h%&Ke&AAVz{mnNG z2_nus36=RGqwaLl+u&I3S%=5o?Yh5H4U-zGb*zWAH)=4%4Kq=3r3s{tS2h!&5LXbj zOfuY{M)*N+hp|Uc1+UGrnV@X-e{5Y1|#)4h!DoFroo`p8$OktG8b7 za?A};JOEkTenmPQaMl+H<-VsKL%62nMV%#ZOl+c_dDRa zUPhhBLiOxb0m)!Pb-feY+73v*n+Z+R4U?Ls=cU(Vi&`qcc3uO8-y0cPcFEcbV4as! zhSWw9Hq`=@)MfwG_+}%FGKX;YvS^ z0J^fYxwAs{3OumLv21$(l7;=+)cN(fEAII#G9Y`g*kZZGP;8 z2zkDhFiMKEh^C+&u61vU0hpk#lT~nnK5FJhXRCd%-|HOq4xL7r_<+HTd2i2tJ(j=s zj&4q5*!<getThread->unsubscribe; } + if ($self->canEdit && $form->process('skip_notification')) { + $self->setSkipNotification; + } if ($self->getThread->getParent->canEdit) { $form->process('isLocked') ? $self->getThread->lock : $self->getThread->unlock; $form->process('isSticky') ? $self->getThread->stick : $self->getThread->unstick; @@ -1715,6 +1718,10 @@ sub www_edit { name=>'contentType', value=>$self->getValue("contentType") || "mixed", }); + $var{'skipNotification.form'} = WebGUI::Form::yesNo($session, { + name=>'skip_notification', + value=>$form->get("skip_notification",'yesNo') || 0, + }); if ($session->setting->get("metaDataEnabled") && $self->getThread->getParent->get('enablePostMetaData')) { my $meta = $self->getMetaDataFields(); diff --git a/lib/WebGUI/Help/Asset_Post.pm b/lib/WebGUI/Help/Asset_Post.pm index 3d19f0f13..016c5eb68 100644 --- a/lib/WebGUI/Help/Asset_Post.pm +++ b/lib/WebGUI/Help/Asset_Post.pm @@ -56,6 +56,7 @@ our $HELP = { { 'name' => 'title.form.textarea' }, { 'name' => 'synopsis.form' }, { 'name' => 'content.form' }, + { 'name' => 'skipNotification.form' }, { 'name' => 'form.submit' }, { 'name' => 'karmaScale.form' }, { 'name' => 'karmaIsEnabled' }, diff --git a/lib/WebGUI/i18n/English/Asset_Post.pm b/lib/WebGUI/i18n/English/Asset_Post.pm index e4b2ed3eb..c7846fb58 100644 --- a/lib/WebGUI/i18n/English/Asset_Post.pm +++ b/lib/WebGUI/i18n/English/Asset_Post.pm @@ -178,6 +178,16 @@ will be a plain text area.|, lastUpdated => 1149829706, }, + 'skipNotification.form' => { + message => q|A field to that allows a user with the correct editing privileges to skip email notification|, + lastUpdated => 1269289137, + }, + + 'Skip notification' => { + message => q|Skip notification|, + lastUpdated => 1269289137, + }, + 'form.submit' => { message => q|A button to submit the post.|, lastUpdated => 1149829706,