From 158fcb0bf631fd22daf74f6ef3d91eac396b41df Mon Sep 17 00:00:00 2001 From: Nikita Romanov Date: Tue, 7 Nov 2023 13:22:40 +0300 Subject: [PATCH 1/2] fix image --- .../migrations/0025_templatefield_image.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 backend/documents/migrations/0025_templatefield_image.py diff --git a/backend/documents/migrations/0025_templatefield_image.py b/backend/documents/migrations/0025_templatefield_image.py new file mode 100644 index 0000000..d2c86af --- /dev/null +++ b/backend/documents/migrations/0025_templatefield_image.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2 on 2023-11-07 10:22 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('documents', '0024_templatefield_length'), + ] + + operations = [ + migrations.AddField( + model_name='templatefield', + name='image', + field=models.ImageField(blank=True, null=True, upload_to='posts/', verbose_name='Картинка'), + ), + ] From 7d3be1360e80000b34dd4e5b7d85a681d698d8b6 Mon Sep 17 00:00:00 2001 From: Nikita Romanov Date: Tue, 7 Nov 2023 13:27:16 +0300 Subject: [PATCH 2/2] fix image --- backend/documents/admin.py | 1 + .../migrations/0026_auto_20231107_1326.py | 22 +++++++++++++++++++ backend/documents/models.py | 14 ++++++------ 3 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 backend/documents/migrations/0026_auto_20231107_1326.py diff --git a/backend/documents/admin.py b/backend/documents/admin.py index 9ca7c34..e65d2b8 100644 --- a/backend/documents/admin.py +++ b/backend/documents/admin.py @@ -49,6 +49,7 @@ class TemplateAdmin(admin.ModelAdmin): "modified", "deleted", "description", + "image", ) list_filter = ("owner", "category", "deleted") readonly_fields = ("id",) diff --git a/backend/documents/migrations/0026_auto_20231107_1326.py b/backend/documents/migrations/0026_auto_20231107_1326.py new file mode 100644 index 0000000..b5fddab --- /dev/null +++ b/backend/documents/migrations/0026_auto_20231107_1326.py @@ -0,0 +1,22 @@ +# Generated by Django 3.2 on 2023-11-07 10:26 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('documents', '0025_templatefield_image'), + ] + + operations = [ + migrations.RemoveField( + model_name='templatefield', + name='image', + ), + migrations.AddField( + model_name='template', + name='image', + field=models.ImageField(blank=True, null=True, upload_to='posts/', verbose_name='Картинка'), + ), + ] diff --git a/backend/documents/models.py b/backend/documents/models.py index 32c0194..de547bf 100644 --- a/backend/documents/models.py +++ b/backend/documents/models.py @@ -50,7 +50,12 @@ class Template(models.Model): modified = models.DateField(verbose_name="Дата модификации", auto_now=True) deleted = models.BooleanField(verbose_name="Удален") description = models.TextField(verbose_name="Описание шаблона") - + image = models.ImageField( + "Картинка", + upload_to="posts/", + null=True, + blank=True, + ) class Meta: verbose_name = "Шаблон" verbose_name_plural = "Шаблоны" @@ -151,12 +156,7 @@ class TemplateField(models.Model): length = models.PositiveIntegerField( blank=True, null=True, verbose_name="Размер поля ввода" ) - image = models.ImageField( - "Картинка", - upload_to="posts/", - null=True, - blank=True, - ) + class Meta: verbose_name = "Поле шаблона"