From 26ccf61ab187238ac2741f4b986279c532419de0 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Fri, 3 Feb 2017 14:27:27 +0530 Subject: [PATCH] FIX: sane error message when inviting an existing user --- app/controllers/invites_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb index 7c539b46ebd..10525811218 100644 --- a/app/controllers/invites_controller.rb +++ b/app/controllers/invites_controller.rb @@ -48,8 +48,8 @@ class InvitesController < ApplicationController guardian.ensure_can_invite_to_forum!(group_ids) invite_exists = Invite.where(email: params[:email], invited_by_id: current_user.id).first - if invite_exists - guardian.ensure_can_send_multiple_invites!(current_user) + if invite_exists && !guardian.can_send_multiple_invites?(current_user) + render json: failed_json, status: 422 end begin @@ -70,8 +70,8 @@ class InvitesController < ApplicationController guardian.ensure_can_invite_to_forum!(group_ids) invite_exists = Invite.where(email: params[:email], invited_by_id: current_user.id).first - if invite_exists - guardian.ensure_can_send_multiple_invites!(current_user) + if invite_exists && !guardian.can_send_multiple_invites?(current_user) + render json: failed_json, status: 422 end begin