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

Merge branch 'bug-published_comments_not_displayed_v2' into 'develop'

Browse Source 
filtration only in moderation v2

See merge request gm/gm-backend!261
This commit is contained in:
Олег Хаятов 2020-02-04 12:53:50 +00:00
commit 6bf5b2a75b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/comment/views/back.py
View File

@ -19,14 +19,15 @@ class CommentLstView(generics.ListCreateAPIView):
qs = models.Comment.objects.with_base_related() qs = models.Comment.objects.with_base_related()
if "object" not in self.kwargs and "type" not in self.kwargs:
qs = qs.filter(status=models.Comment.WAITING)
if "object" in self.kwargs: if "object" in self.kwargs:
qs = qs.by_object_id(self.kwargs["object"]) qs = qs.by_object_id(self.kwargs["object"])
if "type" in self.kwargs and self.kwargs["type"] in allowed: if "type" in self.kwargs and self.kwargs["type"] in allowed:
model = allowed[self.kwargs["type"]] model = allowed[self.kwargs["type"]]
qs = qs.by_content_type(self.kwargs["type"], model) 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') return qs.order_by('-created')