From ff96cba4465ac9298f4a021a83638156d5af5bf9 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 17 Sep 2024 17:15:55 +0200
Subject: [PATCH] Add admin filters

---
 server/vbv_lernwelt/core/admin.py   | 2 ++
 server/vbv_lernwelt/course/admin.py | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/server/vbv_lernwelt/core/admin.py b/server/vbv_lernwelt/core/admin.py
index ce6ddb5f..b1f273a7 100644
--- a/server/vbv_lernwelt/core/admin.py
+++ b/server/vbv_lernwelt/core/admin.py
@@ -112,8 +112,10 @@ class UserAdmin(auth_admin.UserAdmin):
         "last_name",
         "is_active",
         "is_superuser",
+        "organisation",
         "sso_id",
     ]
+    list_filter = ("is_staff", "is_superuser", "is_active", "groups", "organisation")
     search_fields = ["first_name", "last_name", "email", "username", "sso_id"]
     actions = [create_or_sync_berufsbildner]
 
diff --git a/server/vbv_lernwelt/course/admin.py b/server/vbv_lernwelt/course/admin.py
index 1561f191..dacf6e36 100644
--- a/server/vbv_lernwelt/course/admin.py
+++ b/server/vbv_lernwelt/course/admin.py
@@ -66,6 +66,7 @@ class CourseSessionUserAdmin(admin.ModelAdmin):
         "circles",
         "optional_attendance",
         "user_sso_id",
+        "user_organisation",
         # "created_at",
         # "updated_at",
     ]
@@ -79,6 +80,7 @@ class CourseSessionUserAdmin(admin.ModelAdmin):
         "role",
         "course_session",
         "optional_attendance",
+        "user__organisation",
     ]
     raw_id_fields = [
         "user",
@@ -102,6 +104,12 @@ class CourseSessionUserAdmin(admin.ModelAdmin):
     user_sso_id.short_description = "SSO ID"
     user_sso_id.admin_order_field = "user__sso_id"
 
+    def user_organisation(self, obj):
+        return obj.user.organisation
+
+    user_organisation.short_description = "Organisation"
+    user_organisation.admin_order_field = "user__organisation"
+
     def circles(self, obj):
         return ", ".join([c.title for c in obj.expert.all()])