@@ -5,12 +5,13 @@ from django.core.urlresolvers import reverse
from django.db import models
from django.db.models import Q
from django.utils.translation import ugettext_lazy as _
from django.utils.timezone import now
from django.contrib.auth.models import User
from django.core.exceptions import ObjectDoesNotExist
import reversion
from markitup.fields import MarkupField
from model_utils.managers import InheritanceManager
@@ -121,12 +122,19 @@ class ProposalBase(models.Model):
return self.speaker.email
@property
def number(self):
return str(self.pk).zfill(3)
def status(self):
try:
return self.result.status
except ObjectDoesNotExist:
return _('Undecided')
def speakers(self):
yield self.speaker
speakers = self.additional_speakers.exclude(
additionalspeaker__status=AdditionalSpeaker.SPEAKING_STATUS_DECLINED)
for speaker in speakers:
yield speaker