From dc02e9cd45db8379c7953c1335f2bf2959d8b46f Mon Sep 17 00:00:00 2001 From: ludo Date: Mon, 27 Jun 2016 13:18:58 +0200 Subject: [PATCH] ajoute des filtres pour les voeux et spectacles --- bda/admin.py | 11 +++++++---- bda/models.py | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bda/admin.py b/bda/admin.py index 0e257593..604ac883 100644 --- a/bda/admin.py +++ b/bda/admin.py @@ -116,6 +116,7 @@ class AttributionAdminForm(forms.ModelForm): if participant and spectacle: if participant.tirage != spectacle.tirage: raise forms.ValidationError(u"Erreur : le participant et le spectacle n'appartiennent pas au même tirage") + return cleaned_data class AttributionAdmin(admin.ModelAdmin): def paid(self, obj): @@ -129,14 +130,16 @@ class AttributionAdmin(admin.ModelAdmin): import autocomplete_light class ChoixSpectacleAdmin(admin.ModelAdmin): form = autocomplete_light.modelform_factory(ChoixSpectacle, exclude=[]) - list_display = ("participant", "spectacle", "priority", "double_choice") - list_filter = ("double_choice",) + def tirage(self, obj): + return obj.participant.tirage + list_display = ("participant", "tirage", "spectacle", "priority", "double_choice") + list_filter = ("double_choice", "participant__tirage") search_fields = ('participant__user__username', 'participant__user__first_name', 'participant__user__last_name') class SpectacleAdmin(admin.ModelAdmin): model = Spectacle - list_display = ("title", "date", "location", "slots", "price") - list_filter = ("location",) + list_display = ("title", "date", "tirage", "location", "slots", "price") + list_filter = ("location", "tirage",) search_fields = ("title", "location__name") class TirageAdmin(admin.ModelAdmin): diff --git a/bda/models.py b/bda/models.py index 294870c6..16ea4818 100644 --- a/bda/models.py +++ b/bda/models.py @@ -75,7 +75,7 @@ class Participant(models.Model): tirage = models.ForeignKey(Tirage) def __unicode__ (self): - return u"%s, %s" % (self.user, self.tirage.title) + return u"%s" % (self.user) DOUBLE_CHOICES = ( ("1", "1 place"),