From 700927e40f265ad4da5dbdbab0333fbda99584d3 Mon Sep 17 00:00:00 2001 From: Maxwell Salzberg Date: Fri, 5 Aug 2011 18:59:04 -0700 Subject: [PATCH] remove user stubbing --- app/controllers/invitations_controller.rb | 3 +-- config/routes.rb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/invitations_controller.rb b/app/controllers/invitations_controller.rb index f01aaa024..ef9f5185d 100644 --- a/app/controllers/invitations_controller.rb +++ b/app/controllers/invitations_controller.rb @@ -82,8 +82,7 @@ class InvitationsController < Devise::InvitationsController def email @invs = [] - @resource = User.find_by_invitation_token(params[:invitation_token]) || User.first - @resource.invitation_token = 'foobar' + @resource = User.find_by_invitation_token(params[:invitation_token]) render 'devise/mailer/invitation_instructions', :layout => false end protected diff --git a/config/routes.rb b/config/routes.rb index 5dc111920..70a1fc3ce 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -82,7 +82,7 @@ Diaspora::Application.routes.draw do :sessions => "sessions", :invitations => "invitations"} do get 'invitations/resend/:id' => 'invitations#resend', :as => 'invitation_resend' - get 'invitations/invite' => 'invitations#email', :as => 'invite_email' + get 'invitations/email' => 'invitations#email', :as => 'invite_email' end get 'login' => redirect('/users/sign_in')