jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #4079: Allow deleted forum items to be seen with the is_deleted parameter

Browse Source
This commit is contained in:
Albert Yi
2019-05-17 13:11:24 -07:00
parent 0a058dd52b
commit 21ba1000f1
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/forum_post.rb
View File

@@ -162,8 +162,8 @@ class ForumPost < ApplicationRecord
(creator_id == user.id || user.is_moderator?) && visible?(user) (creator_id == user.id || user.is_moderator?) && visible?(user)
end end
def visible?(user) def visible?(user, show_deleted_posts = false)
user.is_moderator? || (topic.visible?(user) && !is_deleted?) user.is_moderator? || (topic.visible?(user) && (show_deleted_posts || !is_deleted?))
end end
def update_topic_updated_at_on_create def update_topic_updated_at_on_create

4
app/views/forum_posts/_forum_post.html.erb
View File

@@ -1,6 +1,4 @@
<%- # original_forum_post_id: used to accelerate #is_original_post? calls %> <% if forum_post.visible?(CurrentUser.user, ActiveModel::Type::Boolean.new.cast(params.dig(:search, :is_deleted))) %>
<% if forum_post.visible?(CurrentUser.user) %>
<article class="forum-post" id="forum_post_<%= forum_post.id %>" data-forum-post-id="<%= forum_post.id %>" data-creator="<%= forum_post.creator.name %>"> <article class="forum-post" id="forum_post_<%= forum_post.id %>" data-forum-post-id="<%= forum_post.id %>" data-creator="<%= forum_post.creator.name %>">
<div class="author"> <div class="author">
<h4> <h4>