VRFS-1979 show landing page for email confirmation
This commit is contained in:
parent
93cef4e0cd
commit
e4a30c768a
|
|
@ -228,9 +228,6 @@ class UsersController < ApplicationController
|
|||
|
||||
if !@user.nil? && !@user.errors.any?
|
||||
UserMailer.welcome_message(@user).deliver
|
||||
sign_in @user
|
||||
redirect_to :client
|
||||
return
|
||||
elsif !@user.nil?
|
||||
# new user with validation errors;
|
||||
logger.debug("#{@user} has errors. can not sign in until remedied. #{@user.errors.inspect}")
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
<% provide(:title, 'Signup Confirmation') %>
|
||||
|
||||
<% if @user.nil? %>
|
||||
<h1>Signup Already Confirmed</h1>
|
||||
|
||||
<h1>Signup Already Confirmed</h1>
|
||||
<br/>
|
||||
<br/>
|
||||
<p>
|
||||
|
|
@ -13,5 +12,14 @@
|
|||
Please proceed to <%= link_to 'the home page', root_path %> and log in.
|
||||
</p>
|
||||
<% else %>
|
||||
The server had a problem. Please try to confirm your email later.
|
||||
<h1>Email Confirmed</h1>
|
||||
<br/>
|
||||
<br/>
|
||||
<p>
|
||||
You have successfully confirmed this email address.
|
||||
</p>
|
||||
<br/>
|
||||
<p>
|
||||
You can proceed to the website <%= link_to 'home page', root_path %> and sign in, or close this page in your browser.
|
||||
</p>
|
||||
<% end %>
|
||||
|
|
|
|||
Loading…
Reference in New Issue