diff --git a/hypha/apply/activity/messaging.py b/hypha/apply/activity/messaging.py index bebe80f3ff1c4929e957d4e5cf2606945081e19d..e73025fe572ddd68c2585b2a52fce32d6f5ffcff 100644 --- a/hypha/apply/activity/messaging.py +++ b/hypha/apply/activity/messaging.py @@ -661,8 +661,8 @@ class EmailAdapter(AdapterBase): MESSAGES.DETERMINATION_OUTCOME: 'handle_determination', MESSAGES.BATCH_DETERMINATION_OUTCOME: 'handle_batch_determination', MESSAGES.INVITED_TO_PROPOSAL: 'messages/email/invited_to_proposal.html', - MESSAGES.BATCH_READY_FOR_REVIEW: 'messages/email/batch_ready_to_review.html', - MESSAGES.READY_FOR_REVIEW: 'messages/email/ready_to_review.html', + MESSAGES.BATCH_READY_FOR_REVIEW: 'handle_batch_ready_for_review', + MESSAGES.READY_FOR_REVIEW: 'handle_ready_for_review', MESSAGES.PARTNERS_UPDATED: 'partners_updated_applicant', MESSAGES.PARTNERS_UPDATED_PARTNER: 'partners_updated_partner', MESSAGES.UPLOAD_CONTRACT: 'messages/email/contract_uploaded.html', @@ -746,6 +746,24 @@ class EmailAdapter(AdapterBase): **kwargs ) + def handle_ready_for_review(self, request, source, **kwargs): + if settings.SEND_READY_FOR_REVIEW: + return self.render_message( + 'messages/email/ready_to_review.html', + source=source, + request=request, + **kwargs + ) + + def handle_batch_ready_for_review(self, request, sources, **kwargs): + if settings.SEND_READY_FOR_REVIEW: + return self.render_message( + 'messages/email/batch_ready_to_review.html', + sources=sources, + request=request, + **kwargs + ) + def notify_comment(self, **kwargs): comment = kwargs['comment'] source = kwargs['source'] diff --git a/hypha/apply/activity/templates/messages/email/batch_ready_to_review.html b/hypha/apply/activity/templates/messages/email/batch_ready_to_review.html index 19ae54272ca3f2d5f68508bcd02822e953907028..1591a1ab3666d53b649ba8054fc85b4b013ec2ea 100644 --- a/hypha/apply/activity/templates/messages/email/batch_ready_to_review.html +++ b/hypha/apply/activity/templates/messages/email/batch_ready_to_review.html @@ -2,7 +2,7 @@ {% block salutation %}Dear Reviewer,{% endblock %} {% block content %} -New proposals have been added to your review list. +New applications have been added to your review list. {% for submission in sources %} Title: {{ submission.title }} diff --git a/hypha/apply/activity/templates/messages/email/ready_to_review.html b/hypha/apply/activity/templates/messages/email/ready_to_review.html index d2713c6c51589162f2e345e586ed4638ba05b9ed..4aa9a622a4af41cefb81900732d11d50af413e22 100644 --- a/hypha/apply/activity/templates/messages/email/ready_to_review.html +++ b/hypha/apply/activity/templates/messages/email/ready_to_review.html @@ -1,6 +1,5 @@ {% extends "messages/email/base.html" %} {% block salutation %}Dear Reviewer,{% endblock %} - {% block content %} This application is awaiting your review. diff --git a/hypha/settings/base.py b/hypha/settings/base.py index 1ae71ef9d34c2599d6f3ca7543ef7b113f02150c..8b93ec7d49b6b1bdcc6ccd7563cb6e0dbb38cec0 100644 --- a/hypha/settings/base.py +++ b/hypha/settings/base.py @@ -524,6 +524,9 @@ if not SEND_MESSAGES: from django.contrib.messages import constants as message_constants MESSAGE_LEVEL = message_constants.DEBUG + +SEND_READY_FOR_REVIEW = env.get('SEND_READY_FOR_REVIEW', 'true').lower() == 'true' + SLACK_DESTINATION_URL = env.get('SLACK_DESTINATION_URL', None) SLACK_DESTINATION_ROOM = env.get('SLACK_DESTINATION_ROOM', None) SLACK_DESTINATION_ROOM_COMMENTS = env.get('SLACK_DESTINATION_ROOM_COMMENTS', None)