Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-05 08:59:27 +08:00
Code Packages Activity Actions 11

FEATURE: Support filtering of groups page by category if in url

Browse source
This commit is contained in:
Robin Ward 2017-10-31 16:47:47 -04:00
parent ca8922e6f8
commit 076df104dc
9 changed files with 67 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/models/group.rb
View file

@ -185,7 +185,8 @@ class Group < ActiveRecord::Base
end
end
def posts_for(guardian, before_post_id = nil)
def posts_for(guardian, opts = nil)
opts ||= {}
user_ids = group_users.map { |gu| gu.user_id }
result = Post.includes(:user, :topic, topic: :category)
.references(:posts, :topics, :category)
@ -193,24 +194,35 @@ class Group < ActiveRecord::Base
.where('topics.archetype <> ?', Archetype.private_message)
.where(post_type: Post.types[:regular])
if opts[:category_id].present?
result = result.where('topics.category_id = ?', opts[:category_id].to_i)
end
result = guardian.filter_allowed_categories(result)
result = result.where('posts.id < ?', before_post_id) if before_post_id
result = result.where('posts.id < ?', opts[:before_post_id].to_i) if opts[:before_post_id]
result.order('posts.created_at desc')
end
def messages_for(guardian, before_post_id = nil)
def messages_for(guardian, opts = nil)
opts ||= {}
result = Post.includes(:user, :topic, topic: :category)
.references(:posts, :topics, :category)
.where('topics.archetype = ?', Archetype.private_message)
.where(post_type: Post.types[:regular])
.where('topics.id IN (SELECT topic_id FROM topic_allowed_groups WHERE group_id = ?)', self.id)
if opts[:category_id].present?
result = result.where('topics.category_id = ?', opts[:category_id].to_i)
end
result = guardian.filter_allowed_categories(result)
result = result.where('posts.id < ?', before_post_id) if before_post_id
result = result.where('posts.id < ?', opts[:before_post_id].to_i) if opts[:before_post_id]
result.order('posts.created_at desc')
end
def mentioned_posts_for(guardian, before_post_id = nil)
def mentioned_posts_for(guardian, opts = nil)
opts ||= {}
result = Post.joins(:group_mentions)
.includes(:user, :topic, topic: :category)
.references(:posts, :topics, :category)
@ -218,8 +230,12 @@ class Group < ActiveRecord::Base
.where(post_type: Post.types[:regular])
.where('group_mentions.group_id = ?', self.id)
if opts[:category_id].present?
result = result.where('topics.category_id = ?', opts[:category_id].to_i)
end
result = guardian.filter_allowed_categories(result)
result = result.where('posts.id < ?', before_post_id) if before_post_id
result = result.where('posts.id < ?', opts[:before_post_id].to_i) if opts[:before_post_id]
result.order('posts.created_at desc')
end