From: Anton Khorev Date: Wed, 20 Mar 2024 15:49:10 +0000 (+0300) Subject: Rename trace local in trace description partial X-Git-Tag: live~544^2 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4dcbe9e0a9d8b2d8f580a5bd19fa19f81d3fef27?hp=1ca91ecbac4443ac87ccae9f7c264537f03211c5 Rename trace local in trace description partial --- diff --git a/app/views/traces/_description.html.erb b/app/views/traces/_description.html.erb index d77173730..538e7f1ec 100644 --- 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 -%> -<%= t ".description_without_count", :user => description.user.display_name %> +<%= t ".description_without_count", :user => trace.user.display_name %> <% end -%> diff --git a/app/views/traces/georss.rss.builder b/app/views/traces/georss.rss.builder index 924ffb935..ad5bd45b2 100644 --- 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.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