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

fixed proposal pks and added notification template to send

Browse source
This commit is contained in:
Brian Rosner 2012-09-08 16:40:00 -06:00
parent 8cb9a41f41
commit b754bb9add
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
symposion/reviews/views.py
View file

@ -396,12 +396,6 @@ def result_notification_prepare(request, section_slug, status):
if request.method != "POST": if request.method != "POST":
return HttpResponseNotAllowed(["POST"]) return HttpResponseNotAllowed(["POST"])
notification_template_pk = request.POST.get("notification_template", "")
if notification_template_pk:
notification_template = NotificationTemplate.objects.get(pk=notification_template_pk)
else:
notification_template = None
proposal_pks = [] proposal_pks = []
try: try:
for pk in request.POST.getlist("_selected_action"): for pk in request.POST.getlist("_selected_action"):
@ -416,12 +410,18 @@ def result_notification_prepare(request, section_slug, status):
proposals = proposals.select_related("speaker__user", "result") proposals = proposals.select_related("speaker__user", "result")
proposals = proposals.select_subclasses() proposals = proposals.select_subclasses()
notification_template_pk = request.POST.get("notification_template", "")
if notification_template_pk:
notification_template = NotificationTemplate.objects.get(pk=notification_template_pk)
else:
notification_template = None
ctx = { ctx = {
"section_slug": section_slug, "section_slug": section_slug,
"status": status, "status": status,
"notification_template": notification_template, "notification_template": notification_template,
"proposals": proposals, "proposals": proposals,
"proposal_pks": " ".join([str(pk) for pk in proposal_pks]), "proposal_pks": ",".join([str(pk) for pk in proposal_pks]),
} }
return render(request, "reviews/result_notification_prepare.html", ctx) return render(request, "reviews/result_notification_prepare.html", ctx)
@ -434,7 +434,7 @@ def result_notification_send(request, section_slug, status):
return HttpResponseBadRequest() return HttpResponseBadRequest()
try: try:
proposal_pks = [int(pk) for pk in request.POST["proposal_pks"]] proposal_pks = [int(pk) for pk in request.POST["proposal_pks"].split(",")]
except ValueError: except ValueError:
return HttpResponseBadRequest() return HttpResponseBadRequest()
@ -446,6 +446,12 @@ def result_notification_send(request, section_slug, status):
proposals = proposals.select_related("speaker__user", "result") proposals = proposals.select_related("speaker__user", "result")
proposals = proposals.select_subclasses() proposals = proposals.select_subclasses()
notification_template_pk = request.POST.get("notification_template", "")
if notification_template_pk:
notification_template = NotificationTemplate.objects.get(pk=notification_template_pk)
else:
notification_template = None
# create ResultNotification objects and send # create ResultNotification objects and send
return redirect("result_notification", section_slug=section_slug, status=status) return redirect("result_notification", section_slug=section_slug, status=status)