IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Remove extra param for group mentionable and messableable route.

Browse Source
This commit is contained in:
Guo Xiang Tan 2018-06-06 09:42:09 +08:00
parent d069f4ecba
commit a83ab01264
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/models/group.js.es6
View File

@ -262,11 +262,11 @@ Group.reopenClass({
}, },
mentionable(name) { mentionable(name) {
return ajax(`/groups/${name}/mentionable`, { data: { name } }); return ajax(`/groups/${name}/mentionable`);
}, },
messageable(name) { messageable(name) {
return ajax(`/groups/${name}/messageable`, { data: { name } }); return ajax(`/groups/${name}/messageable`);
} }
}); });

4
app/controllers/groups_controller.rb
View File

@ -282,7 +282,7 @@ class GroupsController < ApplicationController
end end
def mentionable def mentionable
group = find_group(:name, ensure_can_see: false) group = find_group(:group_id, ensure_can_see: false)
if group if group
render json: { mentionable: Group.mentionable(current_user).where(id: group.id).present? } render json: { mentionable: Group.mentionable(current_user).where(id: group.id).present? }
@ -292,7 +292,7 @@ class GroupsController < ApplicationController
end end
def messageable def messageable
group = find_group(:name, ensure_can_see: false) group = find_group(:group_id, ensure_can_see: false)
if group if group
render json: { messageable: Group.messageable(current_user).where(id: group.id).present? } render json: { messageable: Group.messageable(current_user).where(id: group.id).present? }

20
spec/requests/groups_controller_spec.rb
View File

@ -380,17 +380,19 @@ describe GroupsController do
describe '#mentionable' do describe '#mentionable' do
it "should return the right response" do it "should return the right response" do
sign_in(user) sign_in(user)
group.update_attributes!(name: 'test')
get "/groups/test/mentionable.json", params: { name: group.name } get "/groups/#{group.name}/mentionable.json"
expect(response).to be_success expect(response).to be_success
response_body = JSON.parse(response.body) response_body = JSON.parse(response.body)
expect(response_body["mentionable"]).to eq(false) expect(response_body["mentionable"]).to eq(false)
group.update_attributes!(mentionable_level: Group::ALIAS_LEVELS[:everyone], visibility_level: Group.visibility_levels[:staff]) group.update_attributes!(
mentionable_level: Group::ALIAS_LEVELS[:everyone],
visibility_level: Group.visibility_levels[:staff]
)
get "/groups/test/mentionable.json", params: { name: group.name } get "/groups/#{group.name}/mentionable.json"
expect(response).to be_success expect(response).to be_success
response_body = JSON.parse(response.body) response_body = JSON.parse(response.body)
@ -401,17 +403,19 @@ describe GroupsController do
describe '#messageable' do describe '#messageable' do
it "should return the right response" do it "should return the right response" do
sign_in(user) sign_in(user)
group.update_attributes!(name: 'test')
get "/groups/test/messageable.json", params: { name: group.name } get "/groups/#{group.name}/messageable.json"
expect(response).to be_success expect(response).to be_success
response_body = JSON.parse(response.body) response_body = JSON.parse(response.body)
expect(response_body["messageable"]).to eq(false) expect(response_body["messageable"]).to eq(false)
group.update_attributes!(messageable_level: Group::ALIAS_LEVELS[:everyone], visibility_level: Group.visibility_levels[:staff]) group.update!(
messageable_level: Group::ALIAS_LEVELS[:everyone],
visibility_level: Group.visibility_levels[:staff]
)
get "/groups/test/messageable.json", params: { name: group.name } get "/groups/#{group.name}/messageable.json"
expect(response).to be_success expect(response).to be_success
response_body = JSON.parse(response.body) response_body = JSON.parse(response.body)