Merge branch 'pull/5627'

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 574c9b8b7d512ba745964711bd76f13fbe2f4631..5d817c9c6cf3f525d4669de10174332978f3e6f0 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -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

diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb
index 71dfa42baefafa63bbfbe42a5b42555fbc3d832b..024380de15e88dece8ec71aa089b84374cc88334 100644 (file)
--- a/test/controllers/notes_controller_test.rb
+++ b/test/controllers/notes_controller_test.rb
@@ -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)