From 420d8ec870bd115f0dfd292593771a3f798341b0 2016-09-03 02:48:31
From: Scott Bragg <jsbragg@scriptforge.org>
Date: 2016-09-03 02:48:31
Subject: [PATCH] Remove description from Presentation, add fields to proposal for notification template.

---

diff --git a/requirements/base.txt b/requirements/base.txt
index a5e064854576505d0a0bd55cf5e65fc47d060dec..db8c567e4f3ec3a35c162768e7f014a1e4fb8d52 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,4 +1,4 @@
-Django>=1.9.2
+Django==1.9.2
 django-appconf==1.0.1
 django-model-utils==2.4.0
 django-reversion==1.10.1
diff --git a/symposion/proposals/models.py b/symposion/proposals/models.py
index 4fe07c2ddcbc5d7346379aec5220a105f48c7225..300407dfdfe164d625cc455cd2d52364f968cf48 100644
--- a/symposion/proposals/models.py
+++ b/symposion/proposals/models.py
@@ -196,8 +196,9 @@ class ProposalBase(models.Model):
     def notification_email_context(self):
         return {
             "title": self.title,
-            "speaker": self.speaker.name,
+            "speaker": self.speaker,
             "speakers": ', '.join([x.name for x in self.speakers()]),
+            "additional_speakers": self.additional_speakers,
             "kind": self.kind.name,
         }
 
diff --git a/symposion/reviews/models.py b/symposion/reviews/models.py
index 3baa4a6d883278c92e70ba1dc0f09263c7bab0b7..99b741e903a95bba060fb897c619cf684005d00d 100644
--- a/symposion/reviews/models.py
+++ b/symposion/reviews/models.py
@@ -361,7 +361,6 @@ def promote_proposal(proposal):
     else:
         presentation = Presentation(
             title=proposal.title,
-            description=proposal.description,
             abstract=proposal.abstract,
             speaker=proposal.speaker,
             section=proposal.section,
diff --git a/symposion/reviews/views.py b/symposion/reviews/views.py
index d2ef40e5be20bb37a565dd7d99d51f3ec30ab15d..a7fa592fe52bc1a5b1c93d729bfd5130a38c7198 100644
--- a/symposion/reviews/views.py
+++ b/symposion/reviews/views.py
@@ -645,7 +645,11 @@ def result_notification_send(request, section_slug, status):
         rn.template = notification_template
         rn.to_address = proposal.speaker_email
         rn.from_address = request.POST["from_address"]
-        rn.subject = request.POST["subject"]
+        rn.subject = Template(request.POST["subject"]).render(
+            Context({
+                "proposal": proposal.notification_email_context()
+            })
+        )
         rn.body = Template(request.POST["body"]).render(
             Context({
                 "proposal": proposal.notification_email_context()
diff --git a/symposion/schedule/migrations/0002_auto_20160903_0146.py b/symposion/schedule/migrations/0002_auto_20160903_0146.py
new file mode 100644
index 0000000000000000000000000000000000000000..a1ca17e7536dc0587b3a6fdeb909bc6c3f33cee3
--- /dev/null
+++ b/symposion/schedule/migrations/0002_auto_20160903_0146.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.2 on 2016-09-03 01:46
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('symposion_schedule', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='presentation',
+            name='description',
+        ),
+        migrations.RemoveField(
+            model_name='presentation',
+            name='description_html',
+        ),
+    ]
diff --git a/symposion/schedule/models.py b/symposion/schedule/models.py
index 859faea1b00301544f94d14d170cbe4ae91601a8..c21a4367b0bd06210fbb89a8e5b3e1ab1749eb4d 100644
--- a/symposion/schedule/models.py
+++ b/symposion/schedule/models.py
@@ -185,8 +185,6 @@ class Presentation(models.Model):
 
     slot = models.OneToOneField(Slot, null=True, blank=True, related_name="content_ptr", verbose_name=_("Slot"))
     title = models.CharField(max_length=100, verbose_name=_("Title"))
-    description = models.TextField(verbose_name=_("Description"))
-    description_html = models.TextField(blank=True)
     abstract = models.TextField(verbose_name=_("Abstract"))
     abstract_html = models.TextField(blank=True)
     speaker = models.ForeignKey(Speaker, related_name="presentations", verbose_name=_("Speaker"))
@@ -197,7 +195,6 @@ class Presentation(models.Model):
     section = models.ForeignKey(Section, related_name="presentations", verbose_name=_("Section"))
 
     def save(self, *args, **kwargs):
-        self.description_html = parse(self.description)
         self.abstract_html = parse(self.abstract)
         return super(Presentation, self).save(*args, **kwargs)
 
diff --git a/symposion/schedule/views.py b/symposion/schedule/views.py
index 9c6d7c576293cc7ef9853bd2e2d809471ba60eea..75472fc53b1f575f0cdaf8975a164a52e515bd94 100644
--- a/symposion/schedule/views.py
+++ b/symposion/schedule/views.py
@@ -225,7 +225,6 @@ def schedule_json(request):
                     s.email for s in slot.content.speakers()
                 ] if request.user.is_staff else ["redacted"],
                 "abstract": slot.content.abstract.raw,
-                "description": slot.content.description.raw,
                 "conf_url": "%s://%s%s" % (
                     protocol,
                     Site.objects.get_current().domain,