Download as
Browse Code »

Commit 67fdc2f14728b808cee833c3d3a54e3045bcd894

Authored by Daniela Feitosa
1 parent dbb81838
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

small-enhancement: changed name of attribute 

(ActionItem2998)
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @67fdc2f
... ... @@ -72,7 +72,7 @@ class User < ActiveRecord::Base
72 72 :activation_code => user.activation_code,
73 73 :environment => user.environment.name,
74 74 :url => user.environment.top_url,
75   - :return_to => user.return_to
  75 + :redirection => (true if user.return_to)
76 76 end
77 77  
78 78 def signup_welcome_email(user)
... ...
app/views/user/mailer/activation_code.rhtml
  Diff comments   View file @67fdc2f
1 1 <%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
2 2  
3   -<%= 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) ) }) %>
  3 +<%= 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) }) %>
4 4  
5 5 <%= _("Greetings,") %>
6 6  
... ...