Merge remote-tracking branch 'upstream/master' into routing

[rails.git] / app / views / browse / _way.html.erb

diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb
index fd419586fb1749c8ba4aae9ac0e0fd963ddf1858..b1dffb9ef40e50268de23c6f0ed2249f60eca294 100644 (file)
--- a/app/views/browse/_way.html.erb
+++ b/app/views/browse/_way.html.erb
@@ -15,10 +15,10 @@
       <ul>
         <% way.way_nodes.each do |wn| %>
           <li>
-            <%= link_to h(printable_name(wn.node)), { :action => "node", :id => wn.node_id.to_s }, :class => link_class('node', wn.node), :title => link_title(wn.node) %>
+            <%= link_to printable_name(wn.node), { :action => "node", :id => wn.node_id.to_s }, :class => link_class('node', wn.node), :title => link_title(wn.node) %>
             <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %>
             <% if related_ways.size > 0 then %>
-              (<%= raw t 'browse.way.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(h(printable_name(w)), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>)
+              (<%= raw t 'browse.way.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(printable_name(w), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>)
             <% end %>
           </li>
         <% end %>
@@ -28,7 +28,7 @@
     <% unless way.containing_relation_members.empty? %>
       <h4><%= t'browse.part_of' %></h4>
       <ul>
-        <%= render :partial => "containing_relation", :collection => way.containing_relation_members %>
+        <%= render :partial => "containing_relation", :collection => way.containing_relation_members.uniq %>
       </ul>
     <% end %>
   </div>