From 4871dccea5f9a3ef00a76e04b63fab23122fa353 Mon Sep 17 00:00:00 2001 From: ricardocanela Date: Mon, 25 Mar 2019 10:30:21 -0300 Subject: [PATCH] corrigindo quantidade de argumentos --- requirements/requirements.txt | 4 ++-- sapl/base/email_utils.py | 1 - sapl/base/receivers.py | 7 +++++-- sapl/base/tasks.py | 10 ++++++++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index fb16515f9..8911d9c40 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -26,9 +26,9 @@ unipath==1.1 WeasyPrint==44 Pillow==5.1.0 gunicorn==19.9.0 -celery>=4.0 +celery>=4.0,<4.1 celery-haystack==0.10 -redis>=2.10.5 +redis>=2.10.5,<2.11 django-celery-results==1.0.4 diff --git a/sapl/base/email_utils.py b/sapl/base/email_utils.py index baebea842..3acde9a76 100644 --- a/sapl/base/email_utils.py +++ b/sapl/base/email_utils.py @@ -11,7 +11,6 @@ from sapl.materia.models import AcompanhamentoMateria from sapl.protocoloadm.models import AcompanhamentoDocumento from sapl.settings import EMAIL_SEND_USER from sapl.utils import mail_service_configured -from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _ diff --git a/sapl/base/receivers.py b/sapl/base/receivers.py index 7df85c9a2..ea3de9e2b 100644 --- a/sapl/base/receivers.py +++ b/sapl/base/receivers.py @@ -19,8 +19,11 @@ def handle_tramitacao_signal(sender, **kwargs): tipo = "materia" doc_mat = tramitacao.materia - task_envia_email_tramitacao.delay(get_base_url(request), tipo, doc_mat.id, - tramitacao.status.id, tramitacao.unidade_tramitacao_destino.id) + kwargs = {'base_url': get_base_url(request), 'tipo': tipo, 'doc_mat_id': doc_mat.id, + 'tramitacao_status_id': tramitacao.status.id, + 'tramitacao_unidade_tramitacao_destino_id': tramitacao.unidade_tramitacao_destino.id} + + task_envia_email_tramitacao.delay(kwargs) @receiver(post_delete) diff --git a/sapl/base/tasks.py b/sapl/base/tasks.py index e477767ac..51d792bf4 100644 --- a/sapl/base/tasks.py +++ b/sapl/base/tasks.py @@ -5,8 +5,14 @@ from sapl.protocoloadm.models import StatusTramitacaoAdministrativo, DocumentoAd @app.task(queue='email_queue') -def task_envia_email_tramitacao(base_url, tipo, doc_mat_id, - tramitacao_status_id, tramitacao_unidade_tramitacao_destino_id): +def task_envia_email_tramitacao(kwargs): + + tipo = kwargs.get("tipo") + doc_mat_id = kwargs.get("doc_mat_id") + tramitacao_status_id = kwargs.get("tramitacao_status_id") + tramitacao_unidade_tramitacao_destino_id = kwargs.get("tramitacao_unidade_tramitacao_destino_id") + base_url = kwargs.get("base_url") + if tipo == 'documento': doc_mat = DocumentoAdministrativo.objects.get(id=doc_mat_id) status = StatusTramitacaoAdministrativo.objects.get(id=tramitacao_status_id)