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

What is this?

Browse source
This commit is contained in:
Raphael Sofaer 2011-06-26 12:42:41 -07:00
parent 4fef3b7172
commit b9c2d3758b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/invitations_controller.rb
View file

@ -54,7 +54,7 @@ class InvitationsController < Devise::InvitationsController
user = User.find_by_invitation_token(params[:user][:invitation_token]) user = User.find_by_invitation_token(params[:user][:invitation_token])
user.accept_invitation!(params[:user]) user.accept_invitation!(params[:user])
user.seed_aspects user.seed_aspects
rescue Exception => e rescue Exception => e #What exception is this trying to rescue? If it is ActiveRecord::NotFound, we should say so.
user = nil user = nil
record = e.record record = e.record
record.errors.delete(:person) record.errors.delete(:person)
@ -75,7 +75,7 @@ class InvitationsController < Devise::InvitationsController
invitation = current_user.invitations_from_me.where(:id => params[:id]).first invitation = current_user.invitations_from_me.where(:id => params[:id]).first
if invitation if invitation
Resque.enqueue(Job::ResendInvitation, invitation.id) Resque.enqueue(Job::ResendInvitation, invitation.id)
flash[:notice] = I18n.t('invitations.create.sent') + invitation.recipient.email flash[:notice] = I18n.t('invitations.create.sent') + invitation.recipient.email
end end
redirect_to :back redirect_to :back
end end