fix: показывать пользователя в заявке на модерацию (фолбэк на сущность + бэкфилл)

This commit is contained in:
apuc committed 2026-09-23 18:39:03 +03:00
1 parent 8cbf24bc40
commit 441c9e82cc
1 file changed
+16 -1
+16 -1
View File
@@ -6,12 +6,27 @@ from .models import AuditLog, ModerationRequest
@admin.register(ModerationRequest) @admin.register(ModerationRequest)
class ModerationRequestAdmin(admin.ModelAdmin): class ModerationRequestAdmin(admin.ModelAdmin):
list_display = ( list_display = (
'content_type', 'object_id', 'user', 'decision', 'content_type', 'object_id', 'get_user', 'decision',
'moderator', 'created_at', 'decided_at', 'moderator', 'created_at', 'decided_at',
) )
list_filter = ('decision', 'content_type') list_filter = ('decision', 'content_type')
search_fields = ('comment', 'user__username', 'user__full_name') 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) @admin.register(AuditLog)
class AuditLogAdmin(admin.ModelAdmin): class AuditLogAdmin(admin.ModelAdmin):