From 441c9e82cc65c35eb4c7a2139c17f3c98dfd11cc Mon Sep 17 00:00:00 2001 From: Kavalar Date: Wed, 23 Sep 2026 18:39:03 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7=D1=8B?= =?UTF-8?q?=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20=D0=B2=20=D0=B7=D0=B0?= =?UTF-8?q?=D1=8F=D0=B2=D0=BA=D0=B5=20=D0=BD=D0=B0=20=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D1=8E=20(=D1=84=D0=BE=D0=BB?= =?UTF-8?q?=D0=B1=D1=8D=D0=BA=20=D0=BD=D0=B0=20=D1=81=D1=83=D1=89=D0=BD?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C=20+=20=D0=B1=D1=8D=D0=BA=D1=84=D0=B8?= =?UTF-8?q?=D0=BB=D0=BB)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/moderation/admin.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/apps/moderation/admin.py b/apps/moderation/admin.py index 4ff807b..3cb3fc5 100644 --- a/apps/moderation/admin.py +++ b/apps/moderation/admin.py @@ -6,12 +6,27 @@ from .models import AuditLog, ModerationRequest @admin.register(ModerationRequest) class ModerationRequestAdmin(admin.ModelAdmin): list_display = ( - 'content_type', 'object_id', 'user', 'decision', + 'content_type', 'object_id', 'get_user', 'decision', 'moderator', 'created_at', 'decided_at', ) list_filter = ('decision', 'content_type') search_fields = ('comment', 'user__username', 'user__full_name') + @admin.display(description='Пользователь') + def get_user(self, obj): + """Пользователь из поля user, либо выводимый из сущности.""" + if obj.user: + return obj.user + entity = obj.entity + if entity is None: + return None + for attr in ('user', 'author'): + if hasattr(entity, attr): + return getattr(entity, attr) + if hasattr(entity, 'brand'): + return entity.brand.user + return None + @admin.register(AuditLog) class AuditLogAdmin(admin.ModelAdmin):