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.
This commit is contained in:
parent
85bc737dee
commit
592b28fd23
2 changed files with 7 additions and 3 deletions
|
@ -40,6 +40,10 @@ class NotesController < ApplicationController
|
|||
@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
|
||||
|
|
|
@ -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">
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue