nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix messaging around invitation success/failure

Browse source
This commit is contained in:
Sarah Mei 2010-11-24 09:34:05 -08:00
parent 849072f283
commit fa602cabf2
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/invitations_controller.rb
View file

@ -22,8 +22,10 @@ class InvitationsController < Devise::InvitationsController
invited_users = emails.map { |e| current_user.invite_user(params[:user].merge({:email => e}))} invited_users = emails.map { |e| current_user.invite_user(params[:user].merge({:email => e}))}
good_users, rejected_users = invited_users.partition {|u| u.persisted? } 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[: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(', ') if rejected_users.any?
flash[:error] = I18n.t('invitations.create.rejected') + rejected_users.map{|x| x.email}.join(', ')
end
rescue RuntimeError => e rescue RuntimeError => e
if e.message == "You have no invites" if e.message == "You have no invites"
flash[:error] = I18n.t 'invitations.create.no_more' flash[:error] = I18n.t 'invitations.create.no_more'