From 336aaa96c900296b9e0dfec933c40db572304ea2 Mon Sep 17 00:00:00 2001 From: Zambom Date: Tue, 10 Oct 2017 01:14:48 -0300 Subject: [PATCH] Adjusting error in api get_messages --- api/views.py | 2 +- chat/serializers.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/views.py b/api/views.py index 5887605..5f70571 100644 --- a/api/views.py +++ b/api/views.py @@ -312,7 +312,7 @@ class ChatViewset(viewsets.ModelViewSet, LogMixin): 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') - serializer = ChatSerializer(messages, many = True, context = {"request_user": username}) + serializer = ChatSerializer(messages, many = True, context = {"request_user": user}) json_r = json.dumps(serializer.data) json_r = json.loads(json_r) diff --git a/chat/serializers.py b/chat/serializers.py index 9eeae6a..d671d14 100644 --- a/chat/serializers.py +++ b/chat/serializers.py @@ -16,7 +16,7 @@ class ChatSerializer(serializers.ModelSerializer): user = self.context.get("request_user", None) if not user is None: - return ChatFavorites.objects.filter(Q(user__email = user) & Q(message = message)).exists() + return ChatFavorites.objects.filter(Q(user = user) & Q(message = message)).exists() return False -- libgit2 0.21.2