diff --git a/api/v1/serializers.py b/api/v1/serializers.py index 2a8b8eca..1468313f 100644 --- a/api/v1/serializers.py +++ b/api/v1/serializers.py @@ -193,6 +193,7 @@ class TextSerializer(serializers.ModelSerializer): class ImageTextSerializer(serializers.ModelSerializer): + img = ImageObjectSerializer() class Meta: model = ImageText @@ -202,13 +203,14 @@ class ImageTextSerializer(serializers.ModelSerializer): 'lesson', 'title', 'position', + 'img', + 'txt', 'created_at', 'update_at', - ) + ('img', 'txt',) + ) read_only_fields = ( 'id', - 'img', 'created_at', 'update_at', ) diff --git a/apps/content/migrations/0008_auto_20180208_0631.py b/apps/content/migrations/0008_auto_20180208_0631.py new file mode 100644 index 00000000..3f8b023e --- /dev/null +++ b/apps/content/migrations/0008_auto_20180208_0631.py @@ -0,0 +1,19 @@ +# Generated by Django 2.0.2 on 2018-02-08 06:31 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('content', '0007_auto_20180208_0626'), + ] + + operations = [ + migrations.AlterField( + model_name='imagetext', + name='img', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='content_imagetexts', to='content.ImageObject', verbose_name='Объект изображения'), + ), + ] diff --git a/apps/content/models.py b/apps/content/models.py index 75b6147e..cc4bdd06 100644 --- a/apps/content/models.py +++ b/apps/content/models.py @@ -57,7 +57,10 @@ class Text(Content): class ImageText(Content): - img = models.ImageField('Изображение', upload_to='content/images') + img = models.ForeignKey( + ImageObject, related_name='content_imagetexts', + verbose_name='Объект изображения', on_delete=models.CASCADE, + ) txt = models.TextField('Текст', default='')