Removes dropping note's first comment

Removes dropping note's first visible comment in case of deleted note's author. After adding displaying "deleted" as note's description, first visible comment is now displayed as note's comment. Moves logic of calculating which note comments will be displayed and if note contains anonymous author / comments to the controller.

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 4b4f3d6515f3698370e74d2c92cc96b779b642ac..574c9b8b7d512ba745964711bd76f13fbe2f4631 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -40,6 +40,10 @@ class NotesController < ApplicationController
       @note = Note.visible.find(params[:id])
       @note_comments = @note.comments
     end
       @note = Note.visible.find(params[:id])
       @note_comments = @note.comments
     end

+
+    @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"

   rescue ActiveRecord::RecordNotFound
     render :template => "browse/not_found", :status => :not_found
   end
   rescue ActiveRecord::RecordNotFound
     render :template => "browse/not_found", :status => :not_found
   end

diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb
index 4f20cdd441a227329bc4fca28bcf572c3ad5d016..b65926b5f9df335fd7abbcfda573cfef93ad8c8c 100644 (file)
--- a/app/views/notes/show.html.erb
+++ b/app/views/notes/show.html.erb
@@ -22,7 +22,7 @@
     </p>
   </div>
 
     </p>
   </div>
 

-  <% if @note_comments.find { |comment| comment.author.nil? } -%>
+  <% if @note_includes_anonymous -%>

     <p class='alert alert-warning'><%= t ".anonymous_warning" %></p>
   <% end -%>
 
     <p class='alert alert-warning'><%= t ".anonymous_warning" %></p>
   <% end -%>
 


@@ -52,10 +52,10 @@
     <% end %>
   </div>
 
     <% end %>
   </div>
 

-  <% if @note_comments.length > 1 %>
+  <% if @note_comments.length > 0 %>

     <div class='note-comments'>
       <ul class="list-unstyled">
     <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">
           <li id="c<%= comment.id %>">
             <small class='text-body-secondary'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
             <div class="mx-2">