Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added ResultNotification to admin, fixed subject as template

Browse source
This commit is contained in:
Scott Bragg 2016-09-03 13:16:05 +10:00
parent 420d8ec870
commit c7608fb0d5
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
symposion/reviews/admin.py
View file

@ -1,6 +1,6 @@
from django.contrib import admin from django.contrib import admin
from symposion.reviews.models import NotificationTemplate, ProposalResult from symposion.reviews.models import NotificationTemplate, ProposalResult, ResultNotification
admin.site.register( admin.site.register(
@ -16,3 +16,5 @@ admin.site.register(
ProposalResult, ProposalResult,
list_display=['proposal', 'status', 'score', 'vote_count', 'accepted'] list_display=['proposal', 'status', 'score', 'vote_count', 'accepted']
) )
admin.site.register(ResultNotification)

3
symposion/reviews/models.py
View file

@ -349,6 +349,9 @@ class ResultNotification(models.Model):
for speaker in self.proposal.speakers(): for speaker in self.proposal.speakers():
yield speaker.email yield speaker.email
def __unicode__(self):
return self.proposal.title + ' ' + self.timestamp.strftime('%Y-%m-%d %H:%M:%S')
@property @property
def email_args(self): def email_args(self):
return (self.subject, self.body, self.from_address, self.recipients()) return (self.subject, self.body, self.from_address, self.recipients())

5
symposion/reviews/views.py
View file

@ -645,14 +645,15 @@ def result_notification_send(request, section_slug, status):
rn.template = notification_template rn.template = notification_template
rn.to_address = proposal.speaker_email rn.to_address = proposal.speaker_email
rn.from_address = request.POST["from_address"] rn.from_address = request.POST["from_address"]
proposal_context = proposal.notification_email_context()
rn.subject = Template(request.POST["subject"]).render( rn.subject = Template(request.POST["subject"]).render(
Context({ Context({
"proposal": proposal.notification_email_context() "proposal": proposal_context
}) })
) )
rn.body = Template(request.POST["body"]).render( rn.body = Template(request.POST["body"]).render(
Context({ Context({
"proposal": proposal.notification_email_context() "proposal": proposal_context
}) })
) )
rn.save() rn.save()