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:
@@ -24,7 +24,7 @@ class ForumTopicsController < ApplicationController
|
|||||||
params[:search][:order] ||= "sticky" if request.format == Mime::Type.lookup("text/html")
|
params[:search][:order] ||= "sticky" if request.format == Mime::Type.lookup("text/html")
|
||||||
params[:limit] ||= 40
|
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, :updater).load if request.format.html?
|
||||||
@forum_topics = @forum_topics.includes(:creator, :original_post).load if request.format.atom?
|
@forum_topics = @forum_topics.includes(:creator, :original_post).load if request.format.atom?
|
||||||
|
|
||||||
|
|||||||
@@ -65,6 +65,10 @@ class ForumPost < ApplicationRecord
|
|||||||
q = q.joins(:topic).where("forum_topics.category_id = ?", params[:topic_category_id].to_i)
|
q = q.joins(:topic).where("forum_topics.category_id = ?", params[:topic_category_id].to_i)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
unless params[:is_deleted].present?
|
||||||
|
q = q.active
|
||||||
|
end
|
||||||
|
|
||||||
q.apply_default_order(params)
|
q.apply_default_order(params)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -80,6 +80,10 @@ class ForumTopic < ApplicationRecord
|
|||||||
q = q.apply_default_order(params)
|
q = q.apply_default_order(params)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
unless params[:is_deleted].present?
|
||||||
|
q = q.active
|
||||||
|
end
|
||||||
|
|
||||||
q
|
q
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user