IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 10:50:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add support for preloaded custom_fields on Group

Browse Source
This commit is contained in:
Régis Hanol 2017-08-08 15:45:27 +02:00
parent 76a217c4bc
commit d182f0f2d1
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/groups_controller.rb
View File

@ -30,6 +30,10 @@ class GroupsController < ApplicationController
count = groups.count
groups = groups.offset(page * page_size).limit(page_size)
if Group.preloaded_custom_field_names.present?
Group.preload_custom_fields(groups, Group.preloaded_custom_field_names)
end
group_user_ids = GroupUser.where(group: groups, user: current_user).pluck(:group_id)
render_json_dump(
@ -310,6 +314,10 @@ class GroupsController < ApplicationController
groups = groups.where(automatic: false)
end
if Group.preloaded_custom_field_names.present?
Group.preload_custom_fields(groups, Group.preloaded_custom_field_names)
end
render_serialized(groups, BasicGroupSerializer)
end

3
app/models/group.rb
View File

@ -6,6 +6,9 @@ class Group < ActiveRecord::Base
include HasCustomFields
include AnonCacheInvalidator
cattr_accessor :preloaded_custom_field_names
self.preloaded_custom_field_names = Set.new
has_many :category_groups, dependent: :destroy
has_many :group_users, dependent: :destroy
has_many :group_mentions, dependent: :destroy