This commit is contained in:
@@ -1,10 +1,13 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from kombu import Exchange, Queue
|
||||
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from acls import ModelPermission
|
||||
from common import MayanAppConfig, menu_object
|
||||
from documents.models import Document
|
||||
from mayan.celery import app
|
||||
|
||||
from .links import link_send_document_link, link_send_document
|
||||
from .permissions import (
|
||||
@@ -25,4 +28,16 @@ class MailerApp(MayanAppConfig):
|
||||
)
|
||||
)
|
||||
|
||||
app.conf.CELERY_QUEUES.append(
|
||||
Queue('mailing', Exchange('mailing'), routing_key='mailing'),
|
||||
)
|
||||
|
||||
app.conf.CELERY_ROUTES.update(
|
||||
{
|
||||
'mailer.tasks.task_send_document': {
|
||||
'queue': 'mailing'
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
menu_object.bind_links(links=[link_send_document_link, link_send_document], sources=[Document])
|
||||
|
||||
@@ -65,7 +65,7 @@ def send_document_link(request, document_id=None, document_id_list=None, as_atta
|
||||
subject_template = Template(form.cleaned_data['subject'])
|
||||
subject_text = strip_tags(subject_template.render(context))
|
||||
|
||||
task_send_document.apply_async(args=(subject_text, body_text_content, request.user.email, form.cleaned_data['email']), kwargs={'document_id': document.pk, 'as_attachment': as_attachment}, queue='mailing')
|
||||
task_send_document.apply_async(args=(subject_text, body_text_content, request.user.email, form.cleaned_data['email']), kwargs={'document_id': document.pk, 'as_attachment': as_attachment})
|
||||
|
||||
# TODO: Pluralize
|
||||
messages.success(request, _('Successfully queued for delivery via email.'))
|
||||
|
||||
Reference in New Issue
Block a user