From 8d8a5f50fb848526e6e032cd170f4e9f9ef5e632 Mon Sep 17 00:00:00 2001 From: Kirill Date: Mon, 3 Feb 2020 10:46:44 +0300 Subject: [PATCH] move comments filtration from model to view --- apps/comment/views/back.py | 2 +- apps/utils/middleware.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/comment/views/back.py b/apps/comment/views/back.py index ffd17f6b..1f30e256 100644 --- a/apps/comment/views/back.py +++ b/apps/comment/views/back.py @@ -17,7 +17,7 @@ class CommentLstView(generics.ListCreateAPIView): "establishment": Establishment.__name__.lower() } - qs = models.Comment.objects.with_base_related() + qs = models.Comment.objects.with_base_related().filter(status=models.Comment.WAITING) if "object" in self.kwargs: qs = qs.by_object_id(self.kwargs["object"]) diff --git a/apps/utils/middleware.py b/apps/utils/middleware.py index 7ab5f532..699b333f 100644 --- a/apps/utils/middleware.py +++ b/apps/utils/middleware.py @@ -52,7 +52,10 @@ def parse_cookies(get_response): # processing country country cookie country_code = get_country_code(cookie_dict) - request.country_code = country_code + if country_code and country_code != 'None': + request.country_code = country_code + else: + request.country_code = None response = get_response(request) return response