Rename trace local in trace description partial

diff --git a/app/views/traces/_description.html.erb b/app/views/traces/_description.html.erb
index d77173730b7ae5d22b0d72f632c1affbc7ed1528..538e7f1ec39222745b9a9aabe5a74f93c95447c8 100644 (file)
--- a/app/views/traces/_description.html.erb
+++ b/app/views/traces/_description.html.erb
@@ -1,6 +1,6 @@
-<%= image_tag trace_icon_url(description.user, description.id) %>
-<% 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 -%>
 <% else -%>

-<%= t ".description_without_count", :user => description.user.display_name %>
+<%= t ".description_without_count", :user => trace.user.display_name %>

 <% end -%>
 <% end -%>

diff --git a/app/views/traces/georss.rss.builder b/app/views/traces/georss.rss.builder
index 924ffb9357257631c1213ea138691c9e7a57b7be..ad5bd45b2248d663bb94a514d4dc82dd1bf1b2b1 100644 (file)
--- a/app/views/traces/georss.rss.builder
+++ b/app/views/traces/georss.rss.builder
@@ -25,7 +25,7 @@ xml.rss("version" => "2.0",
         xml.guid show_trace_url(trace.user, trace)
 
         xml.description do
         xml.guid show_trace_url(trace.user, trace)
 
         xml.description do

-          xml.cdata! render(:partial => "description", :object => trace, :formats => [:html])
+          xml.cdata! render(:partial => "description", :object => trace, :as => "trace", :formats => [:html])

         end
 
         xml.dc :creator, trace.user.display_name
         end
 
         xml.dc :creator, trace.user.display_name