Skip to content
Snippets Groups Projects
Unverified Commit 6ef942a2 authored by ThomasBidot's avatar ThomasBidot Committed by GitHub
Browse files

Merge branch 'master' into dev

parents f8db440b 14283adb
Branches
No related tags found
8 merge requests!58Hamza,!52Hamza,!54Add field "en attentes" in participations options,!51Hamza,!48Hamza,!45Hamza,!40Solve public permission files on AWS,!36Notifications for Sec-Gen
......@@ -110,13 +110,11 @@ class ParticipationInline(admin.TabularInline):
school = Student.objects.get(user = participation.user).school
return school
school.short_description = "Établissement"
def name(self, participation: Participation):
"""Returns the participation's user's name"""
return participation.user.first_name + " " + participation.user.last_name
name.short_description = "Nom"
class Media:
css = { "all" : ("css/hide_admin_original.css",) }
......@@ -168,6 +166,7 @@ class ParticipationAdmin(admin.ModelAdmin):
actions = ["export_as_csv"]
def school(self, participation: Participation):
"""Return a link to the participation's user's school."""
school = Student.objects.get(user=participation.user).school
......@@ -236,7 +235,6 @@ class VisitAdmin(admin.ModelAdmin):
return obj.participants.count()
num_participants.short_description = 'Participants'
@ admin.register(Place)
class PlaceAdmin(admin.ModelAdmin):
"""Admin panel for places."""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment