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

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

diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb
index 2c2cdd4c0eba40613edb6758e6bea2726bb716cf..873360bb22ad0d687fba1d4f299510423fa44eeb 100644 (file)
--- a/app/views/browse/_node.html.erb
+++ b/app/views/browse/_node.html.erb
@@ -13,10 +13,10 @@
     <% unless node.ways.empty? and node.containing_relation_members.empty? %>
       <h4><%= t 'browse.part_of' %></h4>
       <ul>
-        <% node.ways.each do |way| %>
-          <li><%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
+        <% node.ways.uniq.each do |way| %>
+          <li><%= link_to printable_name(way), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
         <% end %>
-        <%= render :partial => "containing_relation", :collection => node.containing_relation_members %>
+        <%= render :partial => "containing_relation", :collection => node.containing_relation_members.uniq %>
       </ul>
     <% end %>
   </div>