cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Order of comments in changeset comments feeds

Browse source
This commit is contained in:
nertc 2024-07-05 19:00:15 +04:00
parent 87422e56f9
commit 676aef5be6
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/changeset_comments_controller.rb
View file

@ -18,7 +18,7 @@ class ChangesetCommentsController < ApplicationController
changeset = Changeset.find(id)
# Return comments for this changeset only
@comments = changeset.comments.includes(:author, :changeset).limit(comments_limit)
@comments = changeset.comments.includes(:author, :changeset).reverse_order.limit(comments_limit)
else
# Return comments
@comments = ChangesetComment.includes(:author, :changeset).where(:visible => true).order("created_at DESC").limit(comments_limit).preload(:changeset)

17
test/controllers/changeset_comments_controller_test.rb
View file

@ -46,6 +46,23 @@ class ChangesetCommentsControllerTest < ActionDispatch::IntegrationTest
assert_select "item", :count => 3
end
end
# Rails::Dom::Testing.html_document_fragment.parse(icons)
# Gets comment Ids from HTML and checks that they are in descending order
last_comment_id = -1
assert_select "rss", :count => 1 do
assert_select "description", :count => 3 do |descriptions|
descriptions.children.each do |description|
changeset_dom = Rails::Dom::Testing.html_document_fragment.parse(description.content)
comment = changeset_dom.at_css(".changeset-comment-text")
next unless comment
id = comment.content.split[-1].to_i
assert_operator id, "<", last_comment_id if last_comment_id != -1
last_comment_id = id
end
end
end
end
##