cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reduce welcome email to minimal text

Browse source 
Instead, redirect newly-confirmed users to the welcome
page. If confirmation is not required, redirect immediately
and don't send an email.
This commit is contained in:
John Firebaugh 2013-07-15 17:53:03 -07:00
parent e3aaa6dd4b
commit 2690342b08
7 changed files with 10 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/user_controller.rb
View file

@ -90,15 +90,14 @@ class UserController < ApplicationController
if @user.status == "active"
flash[:notice] = t 'user.new.flash welcome', :email => @user.email
Notifier.signup_confirm(@user, nil).deliver
session[:referer] = welcome_path
successful_login(@user)
else
flash[:notice] = t 'user.new.flash create success message', :email => @user.email
session[:token] = @user.tokens.create.token
Notifier.signup_confirm(@user, @user.tokens.create(:referer => session.delete(:referer))).deliver
Notifier.signup_confirm(@user, @user.tokens.create(:referer => welcome_path)).deliver
redirect_to :action => 'login', :referer => params[:referer]
end