Skip to content

Commit

Permalink
add filter for comments
Browse files Browse the repository at this point in the history
  • Loading branch information
WenjunYuAnny committed Nov 14, 2023
1 parent 4cdfe80 commit 4d3c8b2
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 7 deletions.
16 changes: 12 additions & 4 deletions events/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -918,14 +918,22 @@ def test_private_comment_visible_to_event_creator(self):

def test_event_creator_comments_only_filter(self):
creator_comment = Comment.objects.create(
user=self.creator, event=self.event, content="Creator comment")
user=self.creator, event=self.event, content="Creator comment"
)
user_comment = Comment.objects.create(
user=self.user, event=self.event, content="User comment")
user=self.user, event=self.event, content="User comment"
)
self.client.login(username="testuser", password="testpassword")
response = self.client.get(reverse("events:event-detail", args=[self.event.id]) + '?creator_comments_only=true')
response = self.client.get(
reverse("events:event-detail", args=[self.event.id])
+ "?creator_comments_only=true"
)
self.assertContains(response, creator_comment.content)
self.assertNotContains(response, user_comment.content)
response = self.client.get(reverse("events:event-detail", args=[self.event.id]) + '?creator_comments_only=false')
response = self.client.get(
reverse("events:event-detail", args=[self.event.id])
+ "?creator_comments_only=false"
)
self.assertContains(response, creator_comment.content)
self.assertContains(response, user_comment.content)

Expand Down
10 changes: 7 additions & 3 deletions events/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,10 +344,14 @@ def eventDetail(request, event_id):
pending_join_count = pending_join.count()

comment_form = CommentForm()
creator_comments_only = request.GET.get('creator_comments_only') == 'true'
creator_comments_only = request.GET.get("creator_comments_only") == "true"

if creator_comments_only:
comments = event.comments.filter(parent__isnull=True).filter(is_active=True).filter(user=event.creator)
comments = (
event.comments.filter(parent__isnull=True)
.filter(is_active=True)
.filter(user=event.creator)
)
else:
comments = event.comments.filter(parent__isnull=True).filter(is_active=True)
comments_with_replies = []
Expand All @@ -373,7 +377,7 @@ def eventDetail(request, event_id):
"REMOVED": REMOVED,
"comment_form": comment_form,
"comments_with_replies": comments_with_replies,
'creator_comments_only': creator_comments_only
"creator_comments_only": creator_comments_only,
}
return render(request, "events/event-detail.html", context)

Expand Down

0 comments on commit 4d3c8b2

Please sign in to comment.