From 67fdc2f14728b808cee833c3d3a54e3045bcd894 Mon Sep 17 00:00:00 2001 From: Daniela Soares Feitosa Date: Wed, 19 Mar 2014 14:47:31 +0000 Subject: [PATCH] small-enhancement: changed name of attribute --- app/models/user.rb | 2 +- app/views/user/mailer/activation_code.rhtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 3cb63be..cb2401b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -72,7 +72,7 @@ class User < ActiveRecord::Base :activation_code => user.activation_code, :environment => user.environment.name, :url => user.environment.top_url, - :return_to => user.return_to + :redirection => (true if user.return_to) end def signup_welcome_email(user) diff --git a/app/views/user/mailer/activation_code.rhtml b/app/views/user/mailer/activation_code.rhtml index 7a05794..ac03cc4 100644 --- a/app/views/user/mailer/activation_code.rhtml +++ b/app/views/user/mailer/activation_code.rhtml @@ -1,6 +1,6 @@ <%= _('Hi, %{recipient}!') % { :recipient => @recipient } %> -<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => (true if @return_to) ) }) %> +<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => @redirection) }) %> <%= _("Greetings,") %> -- libgit2 0.21.2