From 91ae3de6dfc8ac3ff2b113cd0ba48076d138142e 2015-06-19 04:04:29 From: Patrick Altman Date: 2015-06-19 04:04:29 Subject: [PATCH] Merge pull request #75 from miurahr/proposal_status Display proposal result status in proposal admin change lists --- diff --git a/symposion/proposals/models.py b/symposion/proposals/models.py index c81a0791c2a8fa549b1f00e8aa1800729cb98a02..5cb4baa6d81ec42a54d8e2461c66675eaceba218 100644 --- a/symposion/proposals/models.py +++ b/symposion/proposals/models.py @@ -8,6 +8,7 @@ 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 @@ -124,6 +125,13 @@ class ProposalBase(models.Model): def number(self): return str(self.pk).zfill(3) + @property + def status(self): + try: + return self.result.status + except ObjectDoesNotExist: + return _('Undecided') + def speakers(self): yield self.speaker speakers = self.additional_speakers.exclude(