alter abuse destination and include type in subject (bug 715712)
This commit is contained in:
Родитель
19137a1ecf
Коммит
f21480dfcf
|
@ -2,6 +2,7 @@ import logging
|
|||
|
||||
from django.conf import settings
|
||||
from django.db import models
|
||||
from django.utils.translation import gettext
|
||||
|
||||
import amo.models
|
||||
import amo.utils
|
||||
|
@ -33,11 +34,17 @@ class AbuseReport(amo.models.ModelBase):
|
|||
user_name = '%s (%s)' % (self.reporter.name, self.reporter.email)
|
||||
else:
|
||||
user_name = 'An anonymous user'
|
||||
subject = 'Abuse Report for %s' % obj.name
|
||||
|
||||
with amo.utils.no_translation():
|
||||
type_ = (gettext(amo.ADDON_TYPE[self.addon.type])
|
||||
if self.addon else 'User')
|
||||
|
||||
subject = u'[%s] Abuse Report for %s' % (type_, obj.name)
|
||||
msg = u'%s reported abuse for %s (%s%s).\n\n%s' % (
|
||||
user_name, obj.name, settings.SITE_URL, obj.get_url_path(),
|
||||
self.message)
|
||||
amo.utils.send_mail(subject, msg, recipient_list=(settings.FLIGTAR,))
|
||||
amo.utils.send_mail(subject, msg,
|
||||
recipient_list=(settings.ABUSE_EMAIL,))
|
||||
|
||||
|
||||
def send_abuse_report(request, obj, message):
|
||||
|
|
|
@ -0,0 +1,29 @@
|
|||
from django.conf import settings
|
||||
from django.core import mail
|
||||
|
||||
from nose.tools import eq_
|
||||
|
||||
import amo
|
||||
import amo.tests
|
||||
from abuse.models import AbuseReport
|
||||
|
||||
|
||||
class TestAbuse(amo.tests.TestCase):
|
||||
fixtures = ['base/users', 'base/addon_3615']
|
||||
|
||||
def test_user(self):
|
||||
abuse = AbuseReport.objects.create(user_id=999)
|
||||
abuse.send()
|
||||
assert mail.outbox[0].subject.startswith('[User]')
|
||||
eq_(mail.outbox[0].to, [settings.ABUSE_EMAIL])
|
||||
|
||||
def test_addon(self):
|
||||
abuse = AbuseReport.objects.create(addon_id=3615)
|
||||
abuse.send()
|
||||
assert mail.outbox[0].subject.startswith('[Extension]')
|
||||
|
||||
def test_addon_fr(self):
|
||||
abuse = AbuseReport.objects.create(addon_id=3615)
|
||||
with self.activate('fr'):
|
||||
abuse.send()
|
||||
assert mail.outbox[0].subject.startswith('[Extension]')
|
|
@ -54,6 +54,7 @@ FLIGTAR = 'amo-admins@mozilla.org'
|
|||
EDITORS_EMAIL = 'amo-editors@mozilla.org'
|
||||
SENIOR_EDITORS_EMAIL = 'amo-admin-reviews@mozilla.org'
|
||||
MARKETPLACE_EMAIL = 'amo-marketplace@mozilla.org'
|
||||
ABUSE_EMAIL = 'marketplace-abuse@mozilla.org'
|
||||
NOBODY_EMAIL = 'nobody@mozilla.org'
|
||||
|
||||
DATABASES = {
|
||||
|
|
Загрузка…
Ссылка в новой задаче