From fa602cabf22592faddb389c06e50ec4f8d2a9e2a Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Wed, 24 Nov 2010 09:34:05 -0800 Subject: [PATCH] fix messaging around invitation success/failure --- app/controllers/invitations_controller.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/invitations_controller.rb b/app/controllers/invitations_controller.rb index 869b9a018..f78c3f2c8 100644 --- a/app/controllers/invitations_controller.rb +++ b/app/controllers/invitations_controller.rb @@ -22,8 +22,10 @@ class InvitationsController < Devise::InvitationsController invited_users = emails.map { |e| current_user.invite_user(params[:user].merge({:email => e}))} good_users, rejected_users = invited_users.partition {|u| u.persisted? } - flash[:notice] = I18n.t('invitations.create.sent') + good_users.map{|x| x.email}.join(', ') - flash[:error] = I18n.t('invitations.create.rejected') + rejected_users.map{|x| x.email}.join(', ') + flash[:notice] = I18n.t('invitations.create.sent') + good_users.map{|x| x.email}.join(', ') + if rejected_users.any? + flash[:error] = I18n.t('invitations.create.rejected') + rejected_users.map{|x| x.email}.join(', ') + end rescue RuntimeError => e if e.message == "You have no invites" flash[:error] = I18n.t 'invitations.create.no_more'