Presentation detail link proposal

symposion/proposals/models.py

@@ -88,6 +88,8 @@ class ProposalBase(models.Model):
     kind = models.ForeignKey(ProposalKind, verbose_name=_("Kind"))
 
     title = models.CharField(max_length=100, verbose_name=_("Title"))
+    name = models.CharField(max_length=100, editable=False)
+
     description = models.TextField(
         _("Brief Description"),
         max_length=400,  # @@@ need to enforce 400 in UI
@@ -163,8 +165,12 @@ def notification_email_context(self):
             "kind": self.kind.name,
         }
 
+    def save(self, *args, **kwargs):
+        self.name = "%s - %s(%s)" % (self.title, self.speaker.name, self.kind.name)
+        super(ProposalBase, self).save(*args, **kwargs)
+
     def __str__(self):
-        return self.title
+        return self.name
 
 reversion.register(ProposalBase)
 

symposion/schedule/models.py

@@ -12,7 +12,6 @@
 
 from symposion.proposals.models import ProposalBase
 from symposion.conference.models import Section
-from symposion.speakers.models import Speaker
 
 
 @python_2_unicode_compatible
@@ -178,25 +177,51 @@ class Meta:
 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 = MarkupField(verbose_name=_("Description"))
-    abstract = MarkupField(verbose_name=_("Abstract"))
-    speaker = models.ForeignKey(Speaker, related_name="presentations", verbose_name=_("Speaker"))
-    additional_speakers = models.ManyToManyField(Speaker, related_name="copresentations",
-                                                 blank=True, verbose_name=_("Additional speakers"))
     cancelled = models.BooleanField(default=False, verbose_name=_("Cancelled"))
     proposal_base = models.OneToOneField(ProposalBase, related_name="presentation", verbose_name=_("Proposal base"))
     section = models.ForeignKey(Section, related_name="presentations", verbose_name=_("Section"))
 
+    @property
+    def proposal(self):
+        if self.proposal_base_id is None:
+            return None
+        return ProposalBase.objects.get_subclass(pk=self.proposal_base_id)
+
     @property
     def number(self):
+        if self.proposal is None:
+            return None
         return self.proposal.number
 
     @property
-    def proposal(self):
-        if self.proposal_base_id is None:
+    def speaker(self):
+        if self.proposal is None:
             return None
-        return ProposalBase.objects.get_subclass(pk=self.proposal_base_id)
+        return self.proposal.speaker
+
+    @property
+    def title(self):
+        if self.proposal is None:
+            return None
+        return self.proposal.title
+
+    @property
+    def description(self):
+        if self.proposal is None:
+            return None
+        return self.proposal.description
+
+    @property
+    def abstract(self):
+        if self.proposal is None:
+            return None
+        return self.proposal.abstract
+
+    @property
+    def additional_speakers(self):
+        if self.proposal is None:
+            return None
+        return self.proposal.additional_speakers
 
     def speakers(self):
         yield self.speaker