Download as
Browse Code »

Commit 91998f5b804e2c309bb666cd12f86fb75618b82b

Authored by Antonio Terceiro
1 parent 302e1cd4
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem1165: sending e-mail do the right place

Showing 3 changed files with 12 additions and 4 deletions   Show diff stats
app/models/person.rb
  Diff comments   View file @91998f5
... ... @@ -194,9 +194,13 @@ class Person < Profile
194 194  
195 195 has_and_belongs_to_many :favorite_enterprises, :class_name => 'Enterprise', :join_table => 'favorite_enteprises_people'
196 196  
  197 + def email_domain
  198 + user && user.email_domain || environment.default_hostname(true)
  199 + end
  200 +
197 201 def email_addresses
198 202 # TODO for now, only one e-mail address
199   - ['%s@%s' % [self.identifier, (self.preferred_domain ? self.preferred_domain.name : self.environment.default_hostname(true)) ] ]
  203 + ['%s@%s' % [self.identifier, self.email_domain] ]
200 204 end
201 205  
202 206 def display_info_to?(user)
... ...
app/models/user.rb
  Diff comments   View file @91998f5
... ... @@ -50,15 +50,19 @@ class User < ActiveRecord::Base
50 50 end
51 51 end
52 52  
  53 + def email_domain
  54 + self.person.preferred_domain && self.person.preferred_domain.name || self.environment.default_hostname(true)
  55 + end
  56 +
53 57 class Mailer < ActionMailer::Base
54 58 def activation_email_notify(user)
55   - user_email = "#{user.login}@#{user.environment.default_hostname(true)}"
  59 + user_email = "#{user.login}@#{user.email_domain}"
56 60 recipients user_email
57 61 from "#{user.environment.name} <#{user.environment.contact_email}>"
58 62 subject _("[%{environment}] Welcome to %{environment} mail!") % { :environment => user.environment.name }
59 63 body :name => user.name,
60 64 :email => user_email,
61   - :webmail => MailConf.webmail_url(user.login, user.person.preferred_domain && user.person.preferred_domain.name || user.environment.default_hostname(true)),
  65 + :webmail => MailConf.webmail_url(user.login, user.email_domain),
62 66 :environment => user.environment.name,
63 67 :url => url_for(:host => user.environment.default_hostname, :controller => 'home')
64 68 end
... ...
app/views/shared/user_menu.rhtml
  Diff comments   View file @91998f5
... ... @@ -31,7 +31,7 @@
31 31  
32 32 <% if MailConf.enabled? && current_user.enable_email %>
33 33 <li>
34   - <%= link_to '<span class="icon-menu-mail"></span>' + _('Webmail'), MailConf.webmail_url(user.identifier, user.preferred_domain && user.preferred_domain.name || user.environment.default_hostname(true)) %>
  34 + <%= link_to '<span class="icon-menu-mail"></span>' + _('Webmail'), MailConf.webmail_url(user.identifier, current_user.email_domain) %>
35 35 </li>
36 36 <% end %>
37 37  
... ...