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

Merge branch 'pull/5627'

Browse source
This commit is contained in:
Anton Khorev 2025-02-06 22:10:31 +03:00
commit a9dcb66e7b
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/notes_controller.rb
View file

@ -43,7 +43,7 @@ class NotesController < ApplicationController
@note_includes_anonymous = @note.author.nil? || @note_comments.find { |comment| comment.author.nil? }
@note_comments = @note_comments.drop(1) unless !@note.author.nil? && @note.author.status == "deleted"
@note_comments = @note_comments.drop(1) if @note.author.nil? || @note.author.active?
rescue ActiveRecord::RecordNotFound
render :template => "browse/not_found", :status => :not_found
end

9
test/controllers/notes_controller_test.rb
View file

@ -152,6 +152,15 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
assert_select "div.note-comments ul li", :count => 1
end
def test_read_note_hidden_opener
hidden_user = create(:user, :deleted)
note_with_hidden_opener = create(:note)
create(:note_comment, :author => hidden_user, :note => note_with_hidden_opener)
sidebar_browse_check :note_path, note_with_hidden_opener.id, "notes/show"
assert_select "div.note-comments ul li", :count => 0
end
def test_read_closed_note
user = create(:user)
closed_note = create(:note_with_comments, :closed, :closed_by => user, :comments_count => 2)