Skip to content

Send review comments (as emails) to authors. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zerothabhishek wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Send review comments (as emails) to authors. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cfp/signals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,19 @@ def send_message_notifications(sender, instance, **kwargs):
user_subject = _('[%(conference)s] Message from the staff') % {'conference': str(conf)}
staff_subject = _('[%(conference)s] Conversation with %(user)s') % {'conference': str(conf), 'user': str(user)}
if author == user: # message from the user, notify the staff
## Author sending message to reviewer
message.send_notification(sender=sender, dests=staff_dests, reply_to=reply_to, message_id=message_id, reference=reference, subject=staff_subject)
else: # message to the user, notify the user, and the staff if the message is not a conference notification
## The message from the user-profile page
message.send_notification(sender=sender, dests=dests, reply_to=reply_to, message_id=message_id, reference=reference, subject=user_subject)
if author != conf:
message.send_notification(sender=sender, dests=staff_dests, reply_to=reply_to, message_id=message_id, reference=reference, subject=staff_subject)
elif hasattr(thread, 'talk'):
message.send_notification(sender=sender, dests=staff_dests,
reply_to=reply_to, message_id=message_id, reference=reference)
## Send the reviewer's comment to the speakers also (be careful with indentation - use spaces not tabs)
speaker_dests = [ (user, user.name, user.email) for user in thread.talk.speakers.all() ]
message.send_notification(sender=sender, dests=speaker_dests, reply_to=reply_to, message_id=message_id, reference=reference)


# connected in apps.py
Expand Down
6 changes: 3 additions & 3 deletions cfp/templates/cfp/staff/talk_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ <h3>{% trans "Vote" %}</h3>
</p>
<p>{{ talk.vote_set.count }} {% trans "vote" %}{{ talk.vote_set.count|pluralize }}, {% trans "average:" %} {{ talk.score|floatformat:1 }}</p>

<a href="{% url 'talk-accept' talk.pk %}" class="btn btn-success">{% trans "Accept" %}</a>
<a href="{% url 'talk-decline' talk.pk %}" class="btn btn-danger">{% trans "Decline" %}</a>
<!-- Removed the Accept/Decline button. Not needed for Pysangamam -->

{% elif talk.accepted == True and talk.confirmed == None %}
<h3>{% trans "Speaker confirmation" %}</h3>

Expand All @@ -125,7 +125,7 @@ <h3>{% trans "Messaging" %}</h3>

{% include 'mailing/_message_list.html' with messages=talk.conversation.message_set.all %}

{% trans "Comment this talk – <em>this message will be received by the staff team only</em>" as message_form_title %}
{% trans "Comment this talk – <em>this message will be received by the staff team and the authors</em>" as message_form_title %}
{% include 'mailing/_message_form.html' %}

{% endblock %}