phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change mark value

Browse Source
This commit is contained in:
dormantman 2020-01-22 17:00:40 +03:00
parent b12253fb6b
commit 07f4947cc0
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/comment/models.py
View File

@ -7,6 +7,7 @@ from account.models import User
from translation.models import Language from translation.models import Language
from utils.models import ProjectBaseMixin from utils.models import ProjectBaseMixin
from utils.querysets import ContentTypeQuerySetMixin from utils.querysets import ContentTypeQuerySetMixin
from django.core.validators import MaxValueValidator, MinValueValidator
class CommentQuerySet(ContentTypeQuerySetMixin): class CommentQuerySet(ContentTypeQuerySetMixin):
@ -64,7 +65,9 @@ class Comment(ProjectBaseMixin):
) )
text = models.TextField(verbose_name=_('Comment text')) text = models.TextField(verbose_name=_('Comment text'))
mark = models.PositiveIntegerField(blank=True, null=True, default=None, verbose_name=_('Mark')) mark = models.PositiveIntegerField(validators=[
MinValueValidator(0), MaxValueValidator(5),
], blank=True, null=True, default=None, verbose_name=_('Mark'))
user = models.ForeignKey('account.User', related_name='comments', on_delete=models.CASCADE, verbose_name=_('User')) user = models.ForeignKey('account.User', related_name='comments', on_delete=models.CASCADE, verbose_name=_('User'))
old_id = models.IntegerField(null=True, blank=True, default=None) old_id = models.IntegerField(null=True, blank=True, default=None)
is_publish = models.BooleanField(default=False, verbose_name=_('Publish status')) is_publish = models.BooleanField(default=False, verbose_name=_('Publish status'))

11
apps/comment/serializers/common.py
View File

@ -8,8 +8,8 @@ from establishment.models import EstablishmentType
class CommentBaseSerializer(serializers.ModelSerializer): class CommentBaseSerializer(serializers.ModelSerializer):
"""Comment serializer""" """Comment serializer"""
nickname = serializers.CharField(read_only=True, user_name = serializers.CharField(read_only=True,
source='user.username') source='user.username')
is_mine = serializers.BooleanField(read_only=True) is_mine = serializers.BooleanField(read_only=True)
profile_pic = serializers.URLField(read_only=True, profile_pic = serializers.URLField(read_only=True,
source='user.cropped_image_url') source='user.cropped_image_url')
@ -32,14 +32,14 @@ class CommentBaseSerializer(serializers.ModelSerializer):
'created', 'created',
'text', 'text',
'mark', 'mark',
'nickname', 'user_name',
'user_email',
'profile_pic', 'profile_pic',
'status', 'status',
'status_display', 'status_display',
'last_ip', 'last_ip',
'content_type', 'content_type',
'content_name', 'content_name'
'user_email'
] ]
extra_kwargs = { extra_kwargs = {
# 'status': {'read_only': True}, # 'status': {'read_only': True},
@ -54,4 +54,3 @@ class CommentBaseSerializer(serializers.ModelSerializer):
return establishment_serializers.EstablishmentTypeBaseSerializer( return establishment_serializers.EstablishmentTypeBaseSerializer(
instance.content_object.establishment_type instance.content_object.establishment_type
).data ).data