jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

comments: fix exception with group_by=comment param.

Browse Source
This commit is contained in:
evazion
2020-03-27 01:34:54 -05:00
parent 597d1304fd
commit 557c15123b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/comments/partials/show/_comment.html.erb
View File

@@ -12,7 +12,7 @@
data-is-deleted="<%= comment.is_deleted? %>" data-is-deleted="<%= comment.is_deleted? %>"
data-is-sticky="<%= comment.is_sticky? %>" data-is-sticky="<%= comment.is_sticky? %>"
data-below-threshold="<%= comment.score < CurrentUser.user.comment_threshold %>" data-below-threshold="<%= comment.score < CurrentUser.user.comment_threshold %>"
<% if policy(moderation_reports).show? %> <% if moderation_reports.present? && policy(moderation_reports).show? %>
data-is-reported="<%= moderation_reports.pluck(:model_id).include?(comment.id) %>" data-is-reported="<%= moderation_reports.pluck(:model_id).include?(comment.id) %>"
<% end %> <% end %>
data-is-voted="<%= comment.voted_by?(CurrentUser.user) %>"> data-is-voted="<%= comment.voted_by?(CurrentUser.user) %>">

2
test/functional/comments_controller_test.rb
View File

@@ -20,6 +20,7 @@ class CommentsControllerTest < ActionDispatch::IntegrationTest
context "index action" do context "index action" do
context "grouped by post" do context "grouped by post" do
should "render all comments for .js" do should "render all comments for .js" do
@comment = as(@user) { create(:comment, post: @post) }
get comments_path(post_id: @post.id), xhr: true get comments_path(post_id: @post.id), xhr: true
assert_response :success assert_response :success
@@ -87,6 +88,7 @@ class CommentsControllerTest < ActionDispatch::IntegrationTest
end end
should "render by comment" do should "render by comment" do
@comment = as(@user) { create(:comment, post: @post) }
get comments_path(group_by: "comment") get comments_path(group_by: "comment")
assert_response :success assert_response :success
end end