From 8cbf24bc405eacd2757655eced391c637013323e Mon Sep 17 00:00:00 2001 From: Kavalar Date: Wed, 23 Sep 2026 18:37:23 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=BF=D1=80=D0=B8=D0=B2=D1=8F=D0=B7?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20=D0=BA=20=D0=B7=D0=B0=D1=8F?= =?UTF-8?q?=D0=B2=D0=BA=D0=B5=20=D0=BD=D0=B0=20=D0=BC=D0=BE=D0=B4=D0=B5?= =?UTF-8?q?=D1=80=D0=B0=D1=86=D0=B8=D1=8E=20=D0=B8=20=D0=B2=D1=8B=D0=B2?= =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=B8=20=D0=B2=20=D0=B0=D0=B4=D0=BC=D0=B8?= =?UTF-8?q?=D0=BD=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/accounts/views.py | 1 + apps/moderation/admin.py | 7 +++++-- .../migrations/0002_moderationrequest_user.py | 21 +++++++++++++++++++ apps/moderation/models.py | 6 ++++++ 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 apps/moderation/migrations/0002_moderationrequest_user.py diff --git a/apps/accounts/views.py b/apps/accounts/views.py index 3ea5a2c..74dd975 100644 --- a/apps/accounts/views.py +++ b/apps/accounts/views.py @@ -100,6 +100,7 @@ def _create_seller(request, data, step3): ModerationRequest.objects.create( content_type=ContentType.objects.get_for_model(Brand), object_id=brand.pk, + user=user, decision='pending', ) AuditLog.objects.create( diff --git a/apps/moderation/admin.py b/apps/moderation/admin.py index d68941a..4ff807b 100644 --- a/apps/moderation/admin.py +++ b/apps/moderation/admin.py @@ -5,9 +5,12 @@ from .models import AuditLog, ModerationRequest @admin.register(ModerationRequest) class ModerationRequestAdmin(admin.ModelAdmin): - list_display = ('content_type', 'object_id', 'decision', 'moderator', 'created_at', 'decided_at') + list_display = ( + 'content_type', 'object_id', 'user', 'decision', + 'moderator', 'created_at', 'decided_at', + ) list_filter = ('decision', 'content_type') - search_fields = ('comment',) + search_fields = ('comment', 'user__username', 'user__full_name') @admin.register(AuditLog) diff --git a/apps/moderation/migrations/0002_moderationrequest_user.py b/apps/moderation/migrations/0002_moderationrequest_user.py new file mode 100644 index 0000000..f8a5339 --- /dev/null +++ b/apps/moderation/migrations/0002_moderationrequest_user.py @@ -0,0 +1,21 @@ +# Generated by Django 5.1.15 on 2026-09-23 15:37 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('moderation', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.AddField( + model_name='moderationrequest', + name='user', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='moderation_requests', to=settings.AUTH_USER_MODEL, verbose_name='Пользователь'), + ), + ] diff --git a/apps/moderation/models.py b/apps/moderation/models.py index 96a72f2..0033dce 100644 --- a/apps/moderation/models.py +++ b/apps/moderation/models.py @@ -20,6 +20,12 @@ class ModerationRequest(models.Model): object_id = models.PositiveIntegerField('ID сущности') entity = GenericForeignKey('content_type', 'object_id') + user = models.ForeignKey( + settings.AUTH_USER_MODEL, null=True, blank=True, + on_delete=models.SET_NULL, related_name='moderation_requests', + verbose_name='Пользователь', + ) + decision = models.CharField( 'Решение', max_length=20, choices=Decision.choices, default=Decision.PENDING,