github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 05:48:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Tweaks to group pages.

Browse Source
This commit is contained in:
Guo Xiang Tan
2018-03-29 14:57:10 +08:00
parent 27f06505b1
commit 52e75eaee9
29 changed files with 468 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/groups_controller.rb
View File

@ -109,7 +109,18 @@ class GroupsController < ApplicationController
end
format.json do
render_serialized(group, GroupShowSerializer, root: 'basic_group')
groups = Group.visible_groups(current_user)
if !guardian.is_staff?
groups = groups.where(automatic: false)
end
render_json_dump(
group: serialize_data(group, GroupShowSerializer, root: nil),
extras: {
visible_group_names: groups.pluck(:name)
}
)
end
end
end
@ -436,7 +447,8 @@ class GroupsController < ApplicationController
def find_group(param_name)
name = params.require(param_name)
group = Group.find_by("lower(name) = ?", name.downcase)
group = Group
group = group.find_by("lower(name) = ?", name.downcase)
guardian.ensure_can_see!(group)
group
end