Commit 336aaa96c900296b9e0dfec933c40db572304ea2
1 parent
00160d3a
Exists in
master
and in
2 other branches
Adjusting error in api get_messages
Showing
2 changed files
with
2 additions
and
2 deletions
Show diff stats
api/views.py
| @@ -312,7 +312,7 @@ class ChatViewset(viewsets.ModelViewSet, LogMixin): | @@ -312,7 +312,7 @@ class ChatViewset(viewsets.ModelViewSet, LogMixin): | ||
| 312 | 312 | ||
| 313 | messages = TalkMessages.objects.filter((Q(talk__user_one__email = username) & Q(talk__user_two__email = user_two)) | (Q(talk__user_one__email = user_two) & Q(talk__user_two__email = username))).order_by('-create_date') | 313 | messages = TalkMessages.objects.filter((Q(talk__user_one__email = username) & Q(talk__user_two__email = user_two)) | (Q(talk__user_one__email = user_two) & Q(talk__user_two__email = username))).order_by('-create_date') |
| 314 | 314 | ||
| 315 | - serializer = ChatSerializer(messages, many = True, context = {"request_user": username}) | 315 | + serializer = ChatSerializer(messages, many = True, context = {"request_user": user}) |
| 316 | 316 | ||
| 317 | json_r = json.dumps(serializer.data) | 317 | json_r = json.dumps(serializer.data) |
| 318 | json_r = json.loads(json_r) | 318 | json_r = json.loads(json_r) |
chat/serializers.py
| @@ -16,7 +16,7 @@ class ChatSerializer(serializers.ModelSerializer): | @@ -16,7 +16,7 @@ class ChatSerializer(serializers.ModelSerializer): | ||
| 16 | user = self.context.get("request_user", None) | 16 | user = self.context.get("request_user", None) |
| 17 | 17 | ||
| 18 | if not user is None: | 18 | if not user is None: |
| 19 | - return ChatFavorites.objects.filter(Q(user__email = user) & Q(message = message)).exists() | 19 | + return ChatFavorites.objects.filter(Q(user = user) & Q(message = message)).exists() |
| 20 | 20 | ||
| 21 | return False | 21 | return False |
| 22 | 22 |