X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5d5d0beefad0436781e0813f9f97d6b3fc313c28..1f1a20e5399d957c8f45a36d5d880aac84a95d3f:/app/views/notes/show.html.erb

diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb
index 4f20cdd44..d0dcdeb1b 100644
--- a/app/views/notes/show.html.erb
+++ b/app/views/notes/show.html.erb
@@ -5,7 +5,7 @@
 <div>
   <h4><%= t(".description") %></h4>
   <div class="overflow-hidden ms-2">
-    <%= note_description(@note.author, @note.description).to_html %>
+    <%= note_description(@note.author, @note.description, current_user&.moderator? ? @note.comments.unscope(:where => :visible).first : @note.comments.first).to_html %>
   </div>
 
   <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
@@ -22,7 +22,7 @@
     </p>
   </div>
 
-  <% if @note_comments.find { |comment| comment.author.nil? } -%>
+  <% if @note_includes_anonymous -%>
     <p class='alert alert-warning'><%= t ".anonymous_warning" %></p>
   <% end -%>
 
@@ -52,10 +52,10 @@
     <% end %>
   </div>
 
-  <% if @note_comments.length > 1 %>
+  <% if @note_comments.length > 0 %>
     <div class='note-comments'>
       <ul class="list-unstyled">
-        <% @note_comments.drop(1).each do |comment| %>
+        <% @note_comments.each do |comment| %>
           <li id="c<%= comment.id %>">
             <small class='text-body-secondary'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
             <div class="mx-2">