diff --git a/pytition/petition/templates/petition/edit_petition.html b/pytition/petition/templates/petition/edit_petition.html
index c9ca8c03..a437b6ae 100644
--- a/pytition/petition/templates/petition/edit_petition.html
+++ b/pytition/petition/templates/petition/edit_petition.html
@@ -59,8 +59,10 @@
data-toggle="list" aria-controls="social_network_form" role="tab"> {% trans "Social Networks" %}
{% trans "E-mail setup" %}
- {% trans "Newsletter setup" %}
+ {% if not settings.DISABLE_NEWSLETTER %}
+ {% trans "Newsletter setup" %}
+ {% endif %}
{% trans "Preview petition" %}
@@ -247,13 +249,15 @@
-
-
-
+ {% if not settings.DISABLE_NEWSLETTER %}
+
+
+
+ {% endif %}
@@ -502,7 +506,7 @@
|| (content_tab_changed && !formcontent.data('submitted'))
|| (formstyle.serialize() !== formstyle.data('serialize') && !formstyle.data('submitted'))
|| (formemail.serialize() !== formemail.data('serialize') && !formemail.data('submitted'))
- || (formnewsletter.serialize() !== formnewsletter.data('serialize') && !formnewsletter.data('submitted'));
+ || (formnewsletter.length > 0 && formnewsletter.serialize() !== formnewsletter.data('serialize') && !formnewsletter.data('submitted'));
}
diff --git a/pytition/petition/views.py b/pytition/petition/views.py
index 4cbfa742..0b3c02fc 100644
--- a/pytition/petition/views.py
+++ b/pytition/petition/views.py
@@ -1299,7 +1299,7 @@ def edit_petition(request, petition_id):
social_network_form = SocialNetworkForm(data)
- if 'newsletter_form_submitted' in request.POST:
+ if not settings.DISABLE_NEWSLETTER and 'newsletter_form_submitted' in request.POST:
submitted_ctx['newsletter_form_submitted'] = True
newsletter_form = NewsletterForm(request.POST)
if newsletter_form.is_valid():
diff --git a/pytition/pytition/settings/base.py b/pytition/pytition/settings/base.py
index d90c024b..ce1b8b92 100644
--- a/pytition/pytition/settings/base.py
+++ b/pytition/pytition/settings/base.py
@@ -264,6 +264,9 @@
#:| If set to True, users won't be able to create petitions in their name, but only for an organization
DISABLE_USER_PETITION = False
+#:| If set to True, users won't be able to set a newsletter on their petitions
+DISABLE_NEWSLETTER = False
+
#:| If set to True, regular users won't be able to create new organizations.
#:| Only superusers will be allowed to
RESTRICT_ORG_CREATION = False