app/controllers/devise/invitations_controller.rb in devise_invitable-0.5.6 vs app/controllers/devise/invitations_controller.rb in devise_invitable-0.5.7
- old
+ new
@@ -24,11 +24,11 @@
end
end
# GET /resource/invitation/accept?invitation_token=abcdef
def edit
- if params[:invitation_token] && self.resource = resource_class.first(:conditions => { :invitation_token => params[:invitation_token] })
+ if params[:invitation_token] && self.resource = resource_class.to_adapter.find_first( :invitation_token => params[:invitation_token] )
render_with_scope :edit
else
set_flash_message(:alert, :invitation_token_invalid)
redirect_to after_sign_out_path_for(resource_name)
end
@@ -53,11 +53,11 @@
end
def has_invitations_left?
unless current_inviter.nil? || current_inviter.has_invitations_left?
build_resource
- set_flash_message :alert, :no_invitations_remaining
+ set_flash_message :alert, :no_invitations_remaining
respond_with_navigational(resource) { render_with_scope :new }
end
end
def after_invite_path_for(resource)
@@ -66,5 +66,6 @@
def after_accept_path_for(resource)
after_sign_in_path_for(resource)
end
end
+