Download as
Browse Code »

Commit 03c8d87862f275f5b4330f862027c9ee66dfcd1b

Authored by Rodrigo Souto
1 parent 0db12ddd
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

Adding target name on contact message 

(ActionItem2042)
Showing 2 changed files with 13 additions and 7 deletions   Show diff stats
app/models/contact.rb
  Diff comments   View file @03c8d87
@@ -32,14 +32,15 @@ class Contact < ActiveRecord::Base #WithoutTable @@ -32,14 +32,15 @@ class Contact < ActiveRecord::Base #WithoutTable
32 if contact.receive_a_copy 32 if contact.receive_a_copy
33 cc "#{contact.name} <#{contact.email}>" 33 cc "#{contact.name} <#{contact.email}>"
34 end 34 end
35 - subject contact.subject 35 + subject "[#{contact.dest.short_name(30)}] " + contact.subject
36 body :name => contact.name, 36 body :name => contact.name,
37 :email => contact.email, 37 :email => contact.email,
38 :city => contact.city, 38 :city => contact.city,
39 :state => contact.state, 39 :state => contact.state,
40 :message => contact.message, 40 :message => contact.message,
41 :environment => contact.dest.environment.name, 41 :environment => contact.dest.environment.name,
42 - :url => url_for(:host => contact.dest.environment.default_hostname, :controller => 'home') 42 + :url => url_for(:host => contact.dest.environment.default_hostname, :controller => 'home'),
  43 + :target => contact.dest.name
43 end 44 end
44 end 45 end
45 46
app/views/contact/sender/mail.rhtml
  Diff comments   View file @03c8d87
1 -<%= _('Name: %s') % @name %>  
2 -<%= _('e-Mail: %s') % @email %>  
3 -<% if @city || @state %>  
4 - <%= _('City and state: %s/%s') % [@city || '?', @state || '?'] %>  
5 -<% end %> 1 +<%= _('This message was sent by %{sender} to %{target} on %{environment}.') %
  2 + {:sender => @name, :target => @target, :environment => @environment} %>
  3 +<%= _('Below here are the informations about the user who sent this message:')%>
  4 +<ul>
  5 + <li><%= content_tag('b', _('Name')+': ') + @name%></li>
  6 + <li><%= content_tag('b', _('Email')+': ') + @email%></li>
  7 + <% if @city || @state %>
  8 + <li><%= content_tag('b', _('City and state')+': ') + (@city || '?')+'/'+(@state || '?') %></li>
  9 + <% end %>
  10 +</ul>
6 11
7 <%= _('Message:') %> 12 <%= _('Message:') %>
8 ------------------------------------------------------------------------------- 13 -------------------------------------------------------------------------------