Adjust how deleted forums get shown

- In some cases deleted items weren't visible from the index view
- There also shouldn't be any reason why they can't be shown when searched for specifically
-- This also matches the behavior on comments
This commit is contained in:
BrokenEagle
2020-01-03 06:47:16 +00:00
parent 043944e1dd
commit 89df0a6ace
3 changed files with 9 additions and 1 deletions

View File

@@ -24,7 +24,7 @@ class ForumTopicsController < ApplicationController
params[:search][:order] ||= "sticky" if request.format == Mime::Type.lookup("text/html")
params[:limit] ||= 40
@forum_topics = ForumTopic.active.paginated_search(params)
@forum_topics = ForumTopic.paginated_search(params)
@forum_topics = @forum_topics.includes(:creator, :updater).load if request.format.html?
@forum_topics = @forum_topics.includes(:creator, :original_post).load if request.format.atom?

View File

@@ -65,6 +65,10 @@ class ForumPost < ApplicationRecord
q = q.joins(:topic).where("forum_topics.category_id = ?", params[:topic_category_id].to_i)
end
unless params[:is_deleted].present?
q = q.active
end
q.apply_default_order(params)
end
end

View File

@@ -80,6 +80,10 @@ class ForumTopic < ApplicationRecord
q = q.apply_default_order(params)
end
unless params[:is_deleted].present?
q = q.active
end
q
end
end