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

FIX: Group owners should be able to invite users to their groups.

Browse Source 
https://meta.discourse.org/t/group-owner-cannot-send-an-invite-to-a-group/60617/12
This commit is contained in:
Guo Xiang Tan
2017-07-21 15:12:24 +09:00
parent fe05587134
commit 2a17f1ccd7
18 changed files with 256 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/controllers/invites_controller.rb
View File

@ -61,9 +61,13 @@ class InvitesController < ApplicationController
def create
params.require(:email)
group_ids = Group.lookup_group_ids(params)
groups = Group.lookup_groups(
group_ids: params[:group_ids],
group_names: params[:group_names]
)
guardian.ensure_can_invite_to_forum!(group_ids)
guardian.ensure_can_invite_to_forum!(groups)
group_ids = groups.map(&:id)
invite_exists = Invite.where(email: params[:email], invited_by_id: current_user.id).first
if invite_exists && !guardian.can_send_multiple_invites?(current_user)
@ -71,7 +75,7 @@ class InvitesController < ApplicationController
end
begin
if Invite.invite_by_email(params[:email], current_user, _topic=nil, group_ids, params[:custom_message])
if Invite.invite_by_email(params[:email], current_user, nil, group_ids, params[:custom_message])
render json: success_json
else
render json: failed_json, status: 422
@ -83,9 +87,15 @@ class InvitesController < ApplicationController
def create_invite_link
params.require(:email)
group_ids = Group.lookup_group_ids(params)
groups = Group.lookup_groups(
group_ids: params[:group_ids],
group_names: params[:group_names]
)
guardian.ensure_can_invite_to_forum!(groups)
topic = Topic.find_by(id: params[:topic_id])
guardian.ensure_can_invite_to_forum!(group_ids)
group_ids = groups.map(&:id)
invite_exists = Invite.where(email: params[:email], invited_by_id: current_user.id).first
if invite_exists && !guardian.can_send_multiple_invites?(current_user)