From 2d5b221349310561dd61d1fe9677f83cca386d33 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 8 Feb 2018 09:37:52 +0300 Subject: [PATCH] Update GalleryImage model --- api/v1/serializers.py | 4 ++-- .../migrations/0009_auto_20180208_0637.py | 23 +++++++++++++++++++ apps/content/models.py | 6 +++-- 3 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 apps/content/migrations/0009_auto_20180208_0637.py diff --git a/api/v1/serializers.py b/api/v1/serializers.py index 1468313f..5bd197f0 100644 --- a/api/v1/serializers.py +++ b/api/v1/serializers.py @@ -257,20 +257,20 @@ class GallerySerializer(serializers.ModelSerializer): class GalleryImageSerializer(serializers.ModelSerializer): + img = ImageObjectSerializer() class Meta: model = GalleryImage fields = ( 'id', 'gallery', - 'image', + 'img', 'created_at', 'update_at', ) read_only_fields = ( 'id', - 'image', 'created_at', 'update_at', ) diff --git a/apps/content/migrations/0009_auto_20180208_0637.py b/apps/content/migrations/0009_auto_20180208_0637.py new file mode 100644 index 00000000..f96f55f6 --- /dev/null +++ b/apps/content/migrations/0009_auto_20180208_0637.py @@ -0,0 +1,23 @@ +# Generated by Django 2.0.2 on 2018-02-08 06:37 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('content', '0008_auto_20180208_0631'), + ] + + operations = [ + migrations.RemoveField( + model_name='galleryimage', + name='image', + ), + migrations.AddField( + model_name='galleryimage', + name='img', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='gallery_images', to='content.ImageObject', verbose_name='Объект изображения'), + ), + ] diff --git a/apps/content/models.py b/apps/content/models.py index cc4bdd06..21b63151 100644 --- a/apps/content/models.py +++ b/apps/content/models.py @@ -90,8 +90,10 @@ class GalleryImage(models.Model): Gallery, on_delete=models.CASCADE, verbose_name='Галерея' ) - image = models.ImageField( - 'Изображение', upload_to='content/gallery_images' + img = models.ForeignKey( + ImageObject, related_name='gallery_images', + verbose_name='Объект изображения', on_delete=models.CASCADE, + null=True, blank=True, ) created_at = models.DateTimeField(auto_now_add=True)