From 81ba477b041814d787c3aae41ecf2e4956ae52de Mon Sep 17 00:00:00 2001 From: George Burton Date: Wed, 26 Jun 2024 10:38:47 +0100 Subject: [PATCH 1/2] import users from admin --- django_app/redbox_app/redbox_core/admin.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/django_app/redbox_app/redbox_core/admin.py b/django_app/redbox_app/redbox_core/admin.py index 7e84a17cb..210d4193c 100644 --- a/django_app/redbox_app/redbox_core/admin.py +++ b/django_app/redbox_app/redbox_core/admin.py @@ -7,12 +7,17 @@ from . import models -class UserAdmin(admin.ModelAdmin): +class UserAdmin(ImportMixin, admin.ModelAdmin): fields = ["email", "business_unit", "grade", "profession", "is_superuser", "is_staff", "last_login"] list_display = ["email", "business_unit", "grade", "profession", "is_superuser", "is_staff", "last_login"] list_filter = ["business_unit", "grade", "profession"] date_hierarchy = "last_login" + class Meta: + model = models.User + fields = ["email"] + import_id_fields = ["email"] + class BusinessUnitAdmin(ImportMixin, admin.ModelAdmin): fields = ["name"] @@ -75,8 +80,18 @@ def export_as_csv(self, request, queryset): # noqa:ARG002 actions = ["export_as_csv"] +class CitationAdmin(admin.ModelAdmin): + list_display = ["chat_message", "text", "get_user", "file"] + list_filter = ["chat_message__chat_history__users"] + + @admin.display(ordering="chat_message__chat_history__users", description="User") + def get_user(self, obj): + return obj.chat_message.chat_history.users + + admin.site.register(models.User, UserAdmin) admin.site.register(models.File, FileAdmin) admin.site.register(models.ChatHistory, ChatHistoryAdmin) admin.site.register(models.ChatMessage, ChatMessageAdmin) +admin.site.register(models.Citation, CitationAdmin) admin.site.register(models.BusinessUnit, BusinessUnitAdmin) From 2e9ddae78813d702492eba262b378e78dca235d8 Mon Sep 17 00:00:00 2001 From: George Burton Date: Wed, 26 Jun 2024 10:40:09 +0100 Subject: [PATCH 2/2] remove citations --- django_app/redbox_app/redbox_core/admin.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/django_app/redbox_app/redbox_core/admin.py b/django_app/redbox_app/redbox_core/admin.py index 210d4193c..7732d4a0f 100644 --- a/django_app/redbox_app/redbox_core/admin.py +++ b/django_app/redbox_app/redbox_core/admin.py @@ -80,18 +80,8 @@ def export_as_csv(self, request, queryset): # noqa:ARG002 actions = ["export_as_csv"] -class CitationAdmin(admin.ModelAdmin): - list_display = ["chat_message", "text", "get_user", "file"] - list_filter = ["chat_message__chat_history__users"] - - @admin.display(ordering="chat_message__chat_history__users", description="User") - def get_user(self, obj): - return obj.chat_message.chat_history.users - - admin.site.register(models.User, UserAdmin) admin.site.register(models.File, FileAdmin) admin.site.register(models.ChatHistory, ChatHistoryAdmin) admin.site.register(models.ChatMessage, ChatMessageAdmin) -admin.site.register(models.Citation, CitationAdmin) admin.site.register(models.BusinessUnit, BusinessUnitAdmin)