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 000000000..ca4ada625 Binary files /dev/null and b/docs/upgrades/packages-7.9.1/default_post_form.wgpkg differ diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm index eb943969b..1c8b8ebb0 100644 --- a/lib/WebGUI/Asset/Post.pm +++ b/lib/WebGUI/Asset/Post.pm @@ -1127,6 +1127,9 @@ sub processPropertiesFromFormPost { else { $self->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,