Merge remote-tracking branch 'upstream/pull/4739'

[rails.git] / app / views / traces / _description.html.erb

diff --git a/app/views/traces/_description.html.erb b/app/views/traces/_description.html.erb
index f4edc0e215c248c9a66a325163d4861fed5efe04..538e7f1ec39222745b9a9aabe5a74f93c95447c8 100644 (file)
--- a/app/views/traces/_description.html.erb
+++ b/app/views/traces/_description.html.erb
@@ -1,6 +1,6 @@
-<%= image_tag(url_for(:controller => :traces, :action => :icon, :id => description.id, :display_name => description.user.display_name)) %>
-<% if description.size -%>
-<%= t ".description_with_count", :count => description.size, :user => description.user.display_name %>
+<%= image_tag trace_icon_url(trace.user, trace) %>
+<% if trace.size -%>
+<%= t ".description_with_count", :count => trace.size, :user => trace.user.display_name %>
 <% else -%>
-<%= t ".description_without_count", :user => description.user.display_name %>
+<%= t ".description_without_count", :user => trace.user.display_name %>
 <% end -%>