remove 404 links to "Unsubscribe" in Marketplace emails (bug 802379)
This commit is contained in:
Родитель
d2b4ebc2c5
Коммит
d2b3e1e0de
|
@ -1,4 +1,5 @@
|
|||
{{ message }}
|
||||
{% if show_unsubscribe %}
|
||||
|
||||
<p>
|
||||
===================================================================<br>
|
||||
|
@ -14,3 +15,4 @@ You received this email because you're subscribed to:
|
|||
{% else %}
|
||||
<p><a href="{{ unsubscribe_url }}">Unsubscribe</a></p>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{{ message }}
|
||||
{% if show_unsubscribe %}
|
||||
|
||||
===================================================================
|
||||
You received this email because you're subscribed to:
|
||||
|
@ -11,3 +12,4 @@ Manage email notifications: {{ manage_url }}
|
|||
{% else %}
|
||||
Unsubscribe: {{ unsubscribe_url }}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
|
|
@ -239,7 +239,9 @@ def send_mail(subject, message, from_email=None, recipient_list=None,
|
|||
'unsubscribe_url': unsubscribe_url,
|
||||
'perm_setting': perm_setting.label,
|
||||
'SITE_URL': settings.SITE_URL,
|
||||
'mandatory': perm_setting.mandatory
|
||||
'mandatory': perm_setting.mandatory,
|
||||
# Hide "Unsubscribe" links in Marketplace emails (bug 802379).
|
||||
'show_unsubscribe': not settings.MARKETPLACE
|
||||
}
|
||||
# Render this template in the default locale until
|
||||
# bug 635840 is fixed.
|
||||
|
|
|
@ -543,7 +543,8 @@ class TestRegionEmail(amo.tests.WebappTestCase):
|
|||
assert dev_url in msg.body
|
||||
assert ' added a new ' in msg.body
|
||||
assert ' for Brazil.' in msg.body
|
||||
assert 'Unsubscribe' in msg.body
|
||||
# TODO: Re-enable this when we bring back Unsubscribe (bug 802379).
|
||||
#assert 'Unsubscribe' in msg.body
|
||||
|
||||
@mock.patch.object(settings, 'SITE_URL', 'http://omg.org/yes')
|
||||
def test_email_for_two_new_regions(self):
|
||||
|
@ -559,7 +560,8 @@ class TestRegionEmail(amo.tests.WebappTestCase):
|
|||
assert dev_url in msg.body
|
||||
assert ' added two new ' in msg.body
|
||||
assert ': Brazil and United Kingdom.' in msg.body
|
||||
assert 'Unsubscribe' in msg.body
|
||||
# TODO: Re-enable this when we bring back Unsubscribe (bug 802379).
|
||||
#assert 'Unsubscribe' in msg.body
|
||||
|
||||
@mock.patch.object(settings, 'SITE_URL', 'http://omg.org/yes')
|
||||
def test_email_for_several_new_regions(self):
|
||||
|
|
Загрузка…
Ссылка в новой задаче