Merge branch 'master' of https://git.eleves.ens.fr/cof-geek/gestioCOF into Aufinal/bda_revente

bda/admin.py

@@ -9,7 +9,7 @@ from django.core.mail import send_mail
 from django.contrib import admin
 from django.db.models import Sum, Count
 from bda.models import Spectacle, Salle, Participant, ChoixSpectacle,\
-    Attribution, Tirage, SpectacleRevente
+    Attribution, Tirage, Quote, CategorieSpectacle, SpectacleRevente
 from django import forms
 
 from datetime import timedelta
@@ -182,7 +182,12 @@ class ChoixSpectacleAdmin(admin.ModelAdmin):
                      'spectacle__title')
 
 
+class QuoteInline(admin.TabularInline):
+    model = Quote
+
+
 class SpectacleAdmin(admin.ModelAdmin):
+    inlines = [QuoteInline]
     model = Spectacle
     list_display = ("title", "date", "tirage", "location", "slots", "price",
                     "listing")
@@ -193,8 +198,9 @@ class SpectacleAdmin(admin.ModelAdmin):
 
 class TirageAdmin(admin.ModelAdmin):
     model = Tirage
-    list_display = ("title", "ouverture", "fermeture", "active")
-    readonly_fields = ("token", )
+    list_display = ("title", "ouverture", "fermeture", "active",
+                    "enable_do_tirage")
+    readonly_fields = ("tokens", )
     list_filter = ("active", )
     search_fields = ("title", )
 
@@ -222,6 +228,7 @@ class SpectacleReventeAdmin(admin.ModelAdmin):
                      "participant__user__lastname",)
 
 
+admin.site.register(CategorieSpectacle)
 admin.site.register(Spectacle, SpectacleAdmin)
 admin.site.register(Salle, SalleAdmin)
 admin.site.register(Participant, ParticipantAdmin)