author for review text
This commit is contained in:
parent
8a34ef6477
commit
bc0db915be
|
|
@ -16,4 +16,5 @@ class ReviewAdminModel(BaseModelAdminMixin, admin.ModelAdmin):
|
||||||
class ReviewTextAuthorAdminModel(BaseModelAdminMixin, admin.ModelAdmin):
|
class ReviewTextAuthorAdminModel(BaseModelAdminMixin, admin.ModelAdmin):
|
||||||
"""Admin model for model ReviewTextAuthor."""
|
"""Admin model for model ReviewTextAuthor."""
|
||||||
|
|
||||||
|
list_display = ('author', 'review', 'locale', 'modified')
|
||||||
raw_id_fields = ('author', 'review')
|
raw_id_fields = ('author', 'review')
|
||||||
|
|
|
||||||
|
|
@ -97,30 +97,6 @@ class Review(BaseAttributes, TranslatedFieldsMixin):
|
||||||
verbose_name_plural = _('Reviews')
|
verbose_name_plural = _('Reviews')
|
||||||
|
|
||||||
|
|
||||||
@receiver(signal=post_init, sender=Review)
|
|
||||||
def post_init_handler(instance, **kwargs):
|
|
||||||
instance.original_text = instance.text
|
|
||||||
|
|
||||||
|
|
||||||
@receiver(signal=post_save, sender=Review)
|
|
||||||
def post_save_handler(instance, **kwargs):
|
|
||||||
new_text = instance.text
|
|
||||||
old_text = instance.original_text
|
|
||||||
if new_text != old_text:
|
|
||||||
for locale in new_text:
|
|
||||||
if locale in old_text:
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
# TODO: для добавленной локали создать запись в ReviewTextAuthor
|
|
||||||
pass
|
|
||||||
|
|
||||||
# TODO: для измененной локали создать или обновить запись в ReviewTextAuthor
|
|
||||||
# TODO: для удаленной локали удалить соответствующую запись в ReviewTextAuthor
|
|
||||||
|
|
||||||
pprint(instance.text)
|
|
||||||
pprint(instance.original_text)
|
|
||||||
|
|
||||||
|
|
||||||
class ReviewTextAuthor(ProjectBaseMixin):
|
class ReviewTextAuthor(ProjectBaseMixin):
|
||||||
author = models.ForeignKey(
|
author = models.ForeignKey(
|
||||||
'account.User',
|
'account.User',
|
||||||
|
|
@ -142,6 +118,19 @@ class ReviewTextAuthor(ProjectBaseMixin):
|
||||||
unique_together = ('locale', 'review')
|
unique_together = ('locale', 'review')
|
||||||
|
|
||||||
|
|
||||||
|
# @receiver(signal=post_init, sender=Review)
|
||||||
|
# def post_init_handler(instance, **kwargs):
|
||||||
|
# instance.original_text = instance.text
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# @receiver(signal=post_save, sender=Review)
|
||||||
|
# def post_save_handler(instance, **kwargs):
|
||||||
|
# new_text = instance.text
|
||||||
|
# old_text = instance.original_text
|
||||||
|
# pprint(instance.text)
|
||||||
|
# pprint(instance.original_text)
|
||||||
|
|
||||||
|
|
||||||
class Inquiries(GalleryMixin, ProjectBaseMixin):
|
class Inquiries(GalleryMixin, ProjectBaseMixin):
|
||||||
NONE = 0
|
NONE = 0
|
||||||
DINER = 1
|
DINER = 1
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,10 @@
|
||||||
"""Review app back serializers."""
|
"""Review app back serializers."""
|
||||||
|
|
||||||
from django.contrib.contenttypes.models import ContentType
|
from django.contrib.contenttypes.models import ContentType
|
||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
|
|
||||||
from account.models import User
|
from account.models import User
|
||||||
from review.models import Review
|
from review.models import Review, ReviewTextAuthor
|
||||||
|
|
||||||
|
|
||||||
class _ReviewerSerializer(serializers.ModelSerializer):
|
class _ReviewerSerializer(serializers.ModelSerializer):
|
||||||
|
|
@ -28,10 +29,24 @@ class _ContentTypeSerializer(serializers.ModelSerializer):
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class _ReviewTextAuthorSerializer(serializers.ModelSerializer):
|
||||||
|
author = _ReviewerSerializer(read_only=True)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = ReviewTextAuthor
|
||||||
|
fields = (
|
||||||
|
'id',
|
||||||
|
'author',
|
||||||
|
'locale',
|
||||||
|
'modified',
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class ReviewBackSerializer(serializers.ModelSerializer):
|
class ReviewBackSerializer(serializers.ModelSerializer):
|
||||||
reviewer_data = _ReviewerSerializer(read_only=True, source='reviewer')
|
reviewer_data = _ReviewerSerializer(read_only=True, source='reviewer')
|
||||||
content_type_data = _ContentTypeSerializer(read_only=True, source='content_type')
|
content_type_data = _ContentTypeSerializer(read_only=True, source='content_type')
|
||||||
status_display = serializers.CharField(read_only=True, source='get_status_display')
|
status_display = serializers.CharField(read_only=True, source='get_status_display')
|
||||||
|
authors = _ReviewTextAuthorSerializer(read_only=True, many=True, source='text_authors')
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Review
|
model = Review
|
||||||
|
|
@ -51,4 +66,72 @@ class ReviewBackSerializer(serializers.ModelSerializer):
|
||||||
'content_type',
|
'content_type',
|
||||||
'content_type_data',
|
'content_type_data',
|
||||||
'object_id',
|
'object_id',
|
||||||
|
'authors',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def update(self, instance, validated_data):
|
||||||
|
old_text = instance.text
|
||||||
|
new_text = validated_data['text']
|
||||||
|
|
||||||
|
# если поле text не менялось - то ничего не делаем
|
||||||
|
if new_text == old_text:
|
||||||
|
return super().update(instance, validated_data)
|
||||||
|
|
||||||
|
# если пользователь анонимный - то ничего не делаем
|
||||||
|
user = self.context['request'].user
|
||||||
|
if user.is_anonymous:
|
||||||
|
return super().update(instance, validated_data)
|
||||||
|
|
||||||
|
for locale, text in new_text.items():
|
||||||
|
|
||||||
|
# если поменяли имеющийся текст
|
||||||
|
if locale in old_text and text != old_text[locale]:
|
||||||
|
review_author, _ = ReviewTextAuthor.objects.update_or_create(
|
||||||
|
review=instance,
|
||||||
|
locale=locale,
|
||||||
|
defaults={
|
||||||
|
'author': user,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
# если добавили новый перевод
|
||||||
|
elif locale not in old_text:
|
||||||
|
ReviewTextAuthor.objects.create(
|
||||||
|
author=user,
|
||||||
|
review=instance,
|
||||||
|
locale=locale,
|
||||||
|
)
|
||||||
|
|
||||||
|
for locale in old_text:
|
||||||
|
|
||||||
|
# Если удалили перевод
|
||||||
|
if locale not in new_text:
|
||||||
|
ReviewTextAuthor.objects.filter(
|
||||||
|
author=user,
|
||||||
|
review=instance,
|
||||||
|
locale=locale,
|
||||||
|
).delete()
|
||||||
|
|
||||||
|
return super().update(instance, validated_data)
|
||||||
|
|
||||||
|
def create(self, validated_data):
|
||||||
|
obj = super().create(validated_data)
|
||||||
|
new_text = validated_data['text']
|
||||||
|
|
||||||
|
# если нет переводов для review - то ничего не делаем
|
||||||
|
if not isinstance(new_text, dict):
|
||||||
|
return obj
|
||||||
|
|
||||||
|
# если пользователь анонимный - то ничего не делаем
|
||||||
|
user = self.context['request'].user
|
||||||
|
if user.is_anonymous:
|
||||||
|
return obj
|
||||||
|
|
||||||
|
for locale, text in new_text.items():
|
||||||
|
ReviewTextAuthor.objects.create(
|
||||||
|
author=user,
|
||||||
|
review=obj,
|
||||||
|
locale=locale,
|
||||||
|
)
|
||||||
|
|
||||||
|
return obj
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user