diff --git a/api/v1/serializers.py b/api/v1/serializers.py index ca2b77f6..2a8b8eca 100644 --- a/api/v1/serializers.py +++ b/api/v1/serializers.py @@ -149,6 +149,7 @@ class LessonSerializer(serializers.ModelSerializer): class ImageSerializer(serializers.ModelSerializer): + img = ImageObjectSerializer() class Meta: model = Image @@ -158,13 +159,13 @@ class ImageSerializer(serializers.ModelSerializer): 'lesson', 'title', 'position', + 'img', 'created_at', 'update_at', - ) + ('img',) + ) read_only_fields = ( 'id', - 'img', 'created_at', 'update_at', ) diff --git a/apps/content/migrations/0007_auto_20180208_0626.py b/apps/content/migrations/0007_auto_20180208_0626.py new file mode 100644 index 00000000..acba3e98 --- /dev/null +++ b/apps/content/migrations/0007_auto_20180208_0626.py @@ -0,0 +1,19 @@ +# Generated by Django 2.0.2 on 2018-02-08 06:26 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('content', '0006_auto_20180208_0551'), + ] + + operations = [ + migrations.AlterField( + model_name='image', + name='img', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='content_images', to='content.ImageObject', verbose_name='Объект изображения'), + ), + ] diff --git a/apps/content/models.py b/apps/content/models.py index 64b1c200..75b6147e 100644 --- a/apps/content/models.py +++ b/apps/content/models.py @@ -46,7 +46,10 @@ class Content(PolymorphicModel): class Image(Content): - img = models.ImageField('Изображение', upload_to='content/images') + img = models.ForeignKey( + ImageObject, related_name='content_images', + verbose_name='Объект изображения', on_delete=models.CASCADE, + ) class Text(Content):