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

forum: make status labels into clickable filters.

Browse Source 
* Make it so that you can click the stickied / locked / deleted icons or
  the new / approved / pending / rejected labels to filter topics by
  that status.

* Replace the `mod_only` search param with `is_private`.
This commit is contained in:
evazion
2020-03-16 17:32:26 -05:00
parent 95d65b25e2
commit 8253df84d9
6 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/bulk_update_request.rb
View File

@@ -19,6 +19,9 @@ class BulkUpdateRequest < ApplicationRecord
scope :pending_first, -> { order(Arel.sql("(case status when 'pending' then 0 when 'approved' then 1 else 2 end)")) }
scope :pending, -> {where(status: "pending")}
scope :approved, -> { where(status: "approved") }
scope :rejected, -> { where(status: "rejected") }
scope :has_topic, -> { where.not(forum_topic: nil) }
scope :expired, -> {where("created_at < ?", TagRelationship::EXPIRY.days.ago)}
scope :old, -> {where("created_at between ? and ?", TagRelationship::EXPIRY.days.ago, TagRelationship::EXPIRY_WARNING.days.ago)}

30
app/models/forum_topic.rb
View File

@@ -33,6 +33,12 @@ class ForumTopic < ApplicationRecord
deletable
scope :public_only, -> { where(min_level: MIN_LEVELS[:None]) }
scope :private_only, -> { where.not(min_level: MIN_LEVELS[:None]) }
scope :pending, -> { where(id: BulkUpdateRequest.has_topic.pending.select(:forum_topic_id)) }
scope :approved, -> { where(category_id: 1).where(id: BulkUpdateRequest.approved.has_topic.select(:forum_topic_id)).where.not(id: BulkUpdateRequest.has_topic.pending.or(BulkUpdateRequest.has_topic.rejected).select(:forum_topic_id)) }
scope :rejected, -> { where(category_id: 1).where(id: BulkUpdateRequest.rejected.has_topic.select(:forum_topic_id)).where.not(id: BulkUpdateRequest.has_topic.pending.or(BulkUpdateRequest.has_topic.approved).select(:forum_topic_id)) }
module CategoryMethods
extend ActiveSupport::Concern
@@ -82,8 +88,24 @@ class ForumTopic < ApplicationRecord
q = q.search_attributes(params, :creator, :updater, :is_sticky, :is_locked, :is_deleted, :category_id, :title, :response_count)
q = q.text_attribute_matches(:title, params[:title_matches], index_column: :text_index)
if params[:mod_only].present?
q = q.where("min_level >= ?", MIN_LEVELS[:Moderator])
if params[:is_private].to_s.truthy?
q = q.private_only
elsif params[:is_private].to_s.falsy?
q = q.public_only
end
if params[:status] == "pending"
q = q.pending
elsif params[:status] == "approved"
q = q.approved
elsif params[:status] == "rejected"
q = q.rejected
end
if params[:is_read].to_s.truthy?
q = q.read_by_user(CurrentUser.user)
elsif params[:is_read].to_s.falsy?
q = q.unread_by_user(CurrentUser.user)
end
case params[:order]
@@ -144,6 +166,10 @@ class ForumTopic < ApplicationRecord
(topic_last_read_at >= updated_at) || (forum_last_read_at >= updated_at)
end
def is_private?
min_level > MIN_LEVELS[:None]
end
def create_mod_action_for_delete
ModAction.log("deleted forum topic ##{id} (title: #{title})", :forum_topic_delete)
end