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

UX: display moderators group name in the group dropdown menu.

Browse Source
This commit is contained in:
Vinoth Kannan
2020-09-11 00:06:40 +05:30
parent a60ba75ac2
commit ba2f3119c0
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/groups_controller.rb
View File

@ -121,7 +121,9 @@ class GroupsController < ApplicationController
format.json do format.json do
groups = Group.visible_groups(current_user) groups = Group.visible_groups(current_user)
groups = groups.where(automatic: false) if !guardian.is_staff? if !guardian.is_staff?
groups = groups.where("automatic IS FALSE OR groups.id = #{Group::AUTO_GROUPS[:moderators]}")
end
render_json_dump( render_json_dump(
group: serialize_data(group, GroupShowSerializer, root: nil), group: serialize_data(group, GroupShowSerializer, root: nil),

3
spec/requests/groups_controller_spec.rb
View File

@ -362,6 +362,7 @@ describe GroupsController do
it "returns the right response" do it "returns the right response" do
sign_in(user) sign_in(user)
mod_group = Group.find(moderator_group_id)
get "/groups/#{group.name}.json" get "/groups/#{group.name}.json"
expect(response.status).to eq(200) expect(response.status).to eq(200)
@ -369,7 +370,7 @@ describe GroupsController do
body = response.parsed_body body = response.parsed_body
expect(body['group']['id']).to eq(group.id) expect(body['group']['id']).to eq(group.id)
expect(body['extras']["visible_group_names"]).to eq([group.name]) expect(body['extras']["visible_group_names"]).to eq([mod_group.name, group.name])
expect(response.headers['X-Robots-Tag']).to eq('noindex') expect(response.headers['X-Robots-Tag']).to eq('noindex')
end end