diff --git a/apps/news/migrations/0041_auto_20191211_1406.py b/apps/news/migrations/0041_auto_20191211_1424.py similarity index 75% rename from apps/news/migrations/0041_auto_20191211_1406.py rename to apps/news/migrations/0041_auto_20191211_1424.py index 70ca5cf1..87d3295d 100644 --- a/apps/news/migrations/0041_auto_20191211_1406.py +++ b/apps/news/migrations/0041_auto_20191211_1424.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.7 on 2019-12-11 14:06 +# Generated by Django 2.2.7 on 2019-12-11 14:24 from django.db import migrations @@ -13,6 +13,6 @@ class Migration(migrations.Migration): operations = [ migrations.AlterUniqueTogether( name='newsgallery', - unique_together={('news', 'image')}, + unique_together={('news', 'image'),}, ), ] diff --git a/apps/news/models.py b/apps/news/models.py index 69ccf392..b4e1b5d5 100644 --- a/apps/news/models.py +++ b/apps/news/models.py @@ -320,4 +320,4 @@ class NewsGallery(IntermediateGalleryModelMixin): """NewsGallery meta class.""" verbose_name = _('news gallery') verbose_name_plural = _('news galleries') - unique_together = (('news', 'image'),) + unique_together = [['news', 'image'],] diff --git a/apps/news/serializers.py b/apps/news/serializers.py index b45bfa3f..41b6ebc4 100644 --- a/apps/news/serializers.py +++ b/apps/news/serializers.py @@ -246,10 +246,11 @@ class NewsBackOfficeGallerySerializer(serializers.ModelSerializer): def create(self, validated_data): news_pk = self.get_request_kwargs().get('pk') image_id = self.get_request_kwargs().get('image_id') - news_gallery_model = models.NewsGallery.objects.filter(image_id=image_id, news_id=news_pk).first() - if news_gallery_model: - news_gallery_model.update(**validated_data) - return news_gallery_model + qs = models.NewsGallery.objects.filter(image_id=image_id, news_id=news_pk) + instance = qs.first() + if instance: + qs.update(**validated_data) + return instance return super().create(validated_data) def validate(self, attrs): @@ -268,8 +269,8 @@ class NewsBackOfficeGallerySerializer(serializers.ModelSerializer): news = news_qs.first() image = image_qs.first() - if image in news.gallery.all(): - raise serializers.ValidationError({'detail': _('Image is already added.')}) + # if image in news.gallery.all(): + # raise serializers.ValidationError({'detail': _('Image is already added.')}) attrs['news'] = news attrs['image'] = image