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

FIX: sane error message when inviting an existing user

Browse Source
This commit is contained in:
Arpit Jalan
2017-02-03 14:27:27 +05:30
parent 67669c00c5
commit 26ccf61ab1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/invites_controller.rb
View File

@@ -48,8 +48,8 @@ class InvitesController < ApplicationController
guardian.ensure_can_invite_to_forum!(group_ids) guardian.ensure_can_invite_to_forum!(group_ids)
invite_exists = Invite.where(email: params[:email], invited_by_id: current_user.id).first invite_exists = Invite.where(email: params[:email], invited_by_id: current_user.id).first
if invite_exists if invite_exists && !guardian.can_send_multiple_invites?(current_user)
guardian.ensure_can_send_multiple_invites!(current_user) render json: failed_json, status: 422
end end
begin begin
@@ -70,8 +70,8 @@ class InvitesController < ApplicationController
guardian.ensure_can_invite_to_forum!(group_ids) guardian.ensure_can_invite_to_forum!(group_ids)
invite_exists = Invite.where(email: params[:email], invited_by_id: current_user.id).first invite_exists = Invite.where(email: params[:email], invited_by_id: current_user.id).first
if invite_exists if invite_exists && !guardian.can_send_multiple_invites?(current_user)
guardian.ensure_can_send_multiple_invites!(current_user) render json: failed_json, status: 422
end end
begin begin