diff --git a/apps/comment/views/back.py b/apps/comment/views/back.py index 1f30e256..d9128e41 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().filter(status=models.Comment.WAITING) + qs = models.Comment.objects.with_base_related() if "object" in self.kwargs: qs = qs.by_object_id(self.kwargs["object"]) @@ -25,6 +25,8 @@ class CommentLstView(generics.ListCreateAPIView): if "type" in self.kwargs and self.kwargs["type"] in allowed: model = allowed[self.kwargs["type"]] qs = qs.by_content_type(self.kwargs["type"], model) + if self.kwargs["type"] == allowed["establishment"] and "object" not in self.kwargs: + qs = qs.filter(status=models.Comment.WAITING) return qs.order_by('-created')