Merge branch 'master' into Kerl/mails_rappel

This commit is contained in:
Martin Pépin 2016-06-22 02:09:45 +02:00
commit e318474567
12 changed files with 118 additions and 24 deletions

View file

@ -28,7 +28,6 @@ class AttributionInlineListing(admin.TabularInline):
return qs.filter(spectacle__listing=True)
class ParticipantAdmin(admin.ModelAdmin):
#inlines = [ChoixSpectacleInline]
inlines = [
AttributionInline,
AttributionInlineListing]
@ -45,8 +44,9 @@ class ParticipantAdmin(admin.ModelAdmin):
else: return u"0 €"
total.admin_order_field = "total"
total.short_description = "Total à payer"
list_display = ("user", "nb_places", "total", "paid", "paymenttype")
list_filter = ("paid",)
list_display = ("user", "nb_places", "total", "paid", "paymenttype",
"tirage")
list_filter = ("paid", "tirage")
search_fields = ('user__username', 'user__first_name', 'user__last_name')
actions = ['send_attribs',]
actions_on_bottom = True