Allow administrators to see deleted diary comments

This commit is contained in:
Tom Hughes 2019-10-17 12:16:28 +01:00
parent 752f190a24
commit 936967d0cb
2 changed files with 6 additions and 5 deletions

View file

@ -235,11 +235,12 @@ class DiaryEntriesController < ApplicationController
end
def comments
conditions = { :user_id => @user }
conditions[:visible] = true unless current_user&.administrator?
@comment_pages, @comments = paginate(:diary_comments,
:conditions => {
:user_id => @user,
:visible => true
},
:conditions => conditions,
:order => "created_at DESC",
:per_page => 20)
@page = (params[:page] || 1).to_i

View file

@ -10,7 +10,7 @@
</tr>
<% @comments.each do |comment| -%>
<% cl = cycle("table0", "table1") %>
<tr class="<%= cl %>">
<tr class="<%= cl %><%= " deemphasize" unless comment.visible? %>">
<td width="25%"><%= link_to comment.diary_entry.title, diary_entry_path(comment.diary_entry.user, comment.diary_entry) %></td>
<td width="25%"><span title="<%= l comment.created_at, :format => :friendly %>"><%= time_ago_in_words(comment.created_at, :scope => :'datetime.distance_in_words_ago') %></span></td>
<td width="50%" class="richtext"><%= comment.body.to_html %></td>