Fix page title for failed trace updates

[rails.git] / app / views / user_mailer / _gpx_description.html.erb

diff --git a/app/views/user_mailer/_gpx_description.html.erb b/app/views/user_mailer/_gpx_description.html.erb
index eb9d5e102340e12f0d5f1435d8cdc702369bbc56..85b4c7cae1c0e9f198a69d75128e722f42a09dac 100644 (file)
--- a/app/views/user_mailer/_gpx_description.html.erb
+++ b/app/views/user_mailer/_gpx_description.html.erb
@@ -1,7 +1,8 @@
-<% trace_name = link_to tag.strong(@trace_name), @trace_url %>
+<% trace_name = tag.strong(@trace_name) %>
+<% trace_name = link_to(trace_name, @trace_url) if @trace_url %>

 <% trace_description = tag.em(@trace_description) %>
 <% if @trace_tags.length > 0 %>
 <% trace_description = tag.em(@trace_description) %>
 <% if @trace_tags.length > 0 %>

-  <% tags = @trace_tags.map(&:tag).join(" ") %>
+  <% tags = safe_join @trace_tags.map { |trace_tag| tag.em trace_tag.tag }, ", " %>

   <%= t ".description_with_tags_html", :trace_name => trace_name, :trace_description => trace_description, :tags => tags %>
 <% else %>
   <%= t ".description_with_no_tags_html", :trace_name => trace_name, :trace_description => trace_description %>
   <%= t ".description_with_tags_html", :trace_name => trace_name, :trace_description => trace_description, :tags => tags %>
 <% else %>
   <%= t ".description_with_no_tags_html", :trace_name => trace_name, :trace_description => trace_description %>