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

added default value of is_main flag in comment section for establishments

Browse Source
This commit is contained in:
Anatoly 2019-09-05 11:53:48 +03:00
parent 3cac53c77d
commit a133cfe1dd
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/comment/models.py
View File

@ -18,11 +18,11 @@ class CommentQuerySet(models.QuerySet):
"""Annotate belonging status""" """Annotate belonging status"""
return self.annotate(is_mine=models.Case( return self.annotate(is_mine=models.Case(
models.When( models.When(
models.Q(user=user), models.Q(user=user if user.is_authenticated else None),
then=True then=True
), ),
default=False, default=False,
output_field=models.BooleanField(default=False) output_field=models.BooleanField()
)) ))

11
apps/establishment/serializers.py
View File

@ -185,14 +185,9 @@ class EstablishmentSerializer(serializers.ModelSerializer):
def get_comments(self, obj): def get_comments(self, obj):
"""Serializer method for comment field""" """Serializer method for comment field"""
request = self.context.get('request') request = self.context.get('request')
if request.user.is_authenticated: return CommentSerializer(obj.comments.annotate_is_mine_status(user=request.user),
return CommentSerializer(obj.comments.annotate_is_mine_status(user=request.user), context={'request': self.context.get('request')},
context={'request': self.context.get('request')}, many=True).data
many=True).data
else:
return CommentSerializer(obj.comments,
context={'request': self.context.get('request')},
many=True).data
def get_preview_image(self, obj): def get_preview_image(self, obj):
"""Get preview image""" """Get preview image"""