From 6793194adccb275f5a79d8a1d61bd1812f58d6ad Mon Sep 17 00:00:00 2001 From: Ludovic Stephan Date: Sat, 23 Jul 2016 22:21:30 +0200 Subject: [PATCH] fix affichage admin --- bda/admin.py | 3 ++- bda/models.py | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bda/admin.py b/bda/admin.py index 3717e438..05947534 100644 --- a/bda/admin.py +++ b/bda/admin.py @@ -214,7 +214,8 @@ class SpectacleReventeAdmin(admin.ModelAdmin): return obj.attribution.participant list_display = ("spectacle", "participant", "date", "sold") - readonly_fields = ("shotgun",) + raw_id_fields = ("attribution",) + readonly_fields = ("shotgun", "expiration_time") list_filter = ("sold", ) search_fields = ("spectacle__title", "participant__user__username", diff --git a/bda/models.py b/bda/models.py index 405236b9..b0dd8aeb 100644 --- a/bda/models.py +++ b/bda/models.py @@ -179,7 +179,8 @@ class Attribution(models.Model): given = models.BooleanField("Donnée", default=False) def __str__(self): - return "%s -- %s" % (self.participant, self.spectacle) + return "%s -- %s, %s" % (self.participant.user, self.spectacle.title, + self.spectacle.date) @python_2_unicode_compatible @@ -192,13 +193,14 @@ class SpectacleRevente(models.Model): def get_expiration_time(self): remaining_time = (self.attribution.spectacle.date - self.date) delay = max(datetime.timedelta(hours=2), - min(remaining_time/2, datetime.timedelta(days=2))) + min(remaining_time//2, datetime.timedelta(days=2))) return self.date + delay expiration_time = property(get_expiration_time) def get_shotgun(self): - return timezone.now > self.expiration_time + return timezone.now() > self.expiration_time shotgun = property(get_shotgun) def __str__(self): - return "%s" % self.attribution + return "%s -- %s" % (self.attribution.participant.user, + self.attribution.spectacle.title)