From b95c9b2e66d7446d72985208fb627f026d6a063d Mon Sep 17 00:00:00 2001 From: maxwell Date: Fri, 25 Feb 2011 14:54:07 -0800 Subject: [PATCH] actually send email from admin interface inviter --- app/controllers/admins_controller.rb | 2 +- app/models/invitation.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/admins_controller.rb b/app/controllers/admins_controller.rb index 0e7f876d6..80dbefcc6 100644 --- a/app/controllers/admins_controller.rb +++ b/app/controllers/admins_controller.rb @@ -17,7 +17,7 @@ class AdminsController < ApplicationController end def admin_inviter - Invitation.create_invitee(:identifier => params[:identifier]) + Invitation.create_invitee(:service => 'email', :identifier => params[:identifier]) flash[:notice] = "invitation sent to #{params[:identifier]}" redirect_to '/admins/user_search' end diff --git a/app/models/invitation.rb b/app/models/invitation.rb index 886731f3e..8fb780d10 100644 --- a/app/models/invitation.rb +++ b/app/models/invitation.rb @@ -74,6 +74,7 @@ class Invitation < ActiveRecord::Base opts[:from].save! invitee.reload end + puts (opts[:service] == 'email') invitee.invite!(:email => (opts[:service] == 'email')) log_string = "event=invitation_sent to=#{opts[:identifier]} service=#{opts[:service]} " log_string << "inviter=#{opts[:from].diaspora_handle} inviter_uid=#{opts[:from].id} inviter_created_at_unix=#{opts[:from].created_at.to_i}" if opts[:from]