From a43dffc7f73d9978800ef00b2a8251a6bf68eda8 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Tue, 25 May 2021 19:17:00 +0200 Subject: [PATCH] Add team admin --- server/books/tests/test_snapshots.py | 2 -- server/users/admin.py | 13 ++++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/server/books/tests/test_snapshots.py b/server/books/tests/test_snapshots.py index e66f40f8..72330ec8 100644 --- a/server/books/tests/test_snapshots.py +++ b/server/books/tests/test_snapshots.py @@ -170,7 +170,6 @@ class CreateSnapshotTestCase(SkillboxTestCase): }) self._test_create_snapshot(result) - def test_create_two_snapshots(self): self.client.execute(CREATE_SNAPSHOT_MUTATION, variables={ 'input': { @@ -186,7 +185,6 @@ class CreateSnapshotTestCase(SkillboxTestCase): }) self._test_create_snapshot(result, num_snapshots=2) - def test_apply_snapshot(self): self.snapshot = Snapshot.objects.create_snapshot(module=self.module, school_class=self.skillbox_class, user=self.teacher) diff --git a/server/users/admin.py b/server/users/admin.py index 1b6832d5..e88a7376 100644 --- a/server/users/admin.py +++ b/server/users/admin.py @@ -2,7 +2,7 @@ from django.contrib import admin from django.contrib.auth.admin import UserAdmin from users.forms import CustomUserCreationForm, CustomUserChangeForm -from .models import User, SchoolClass, Role, UserRole, UserSetting, License, UserData +from .models import User, SchoolClass, Role, UserRole, UserSetting, License, UserData, Team class SchoolClassInline(admin.TabularInline): @@ -51,6 +51,7 @@ class CustomUserAdmin(UserAdmin): list_filter = ('school_classes', 'is_superuser') ordering = ['pk'] search_fields = ('username', 'first_name', 'last_name') + autocomplete_fields = ('team',) inlines = [ SchoolClassInline, @@ -86,3 +87,13 @@ class UserDataAdmin(admin.ModelAdmin): list_display = ('user', 'accepted_terms') list_filter = ('accepted_terms',) raw_id_fields = ('user',) + + +@admin.register(Team) +class TeamAdmin(admin.ModelAdmin): + list_display = ('name', 'creator', 'member_list',) + readonly_fields = ('member_list',) + search_fields = ('name', 'creator__first_name', 'creator__last_name') + + def member_list(self, obj): + return ', '.join([member.full_name for member in obj.members.all()])