From: Tom Hughes <tom@compton.nu>
Date: Sun, 23 Feb 2014 00:08:51 +0000 (+0000)
Subject: Uniqify lists of containing ways/relations
X-Git-Tag: live~4429
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d1313a89d6f0ff7908b8aabc81687201190dc835

Uniqify lists of containing ways/relations

Fixes #707
---

diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb
index 2c2cdd4c0..581c49b09 100644
--- 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| %>
+        <% node.ways.uniq.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>
         <% end %>
-        <%= render :partial => "containing_relation", :collection => node.containing_relation_members %>
+        <%= render :partial => "containing_relation", :collection => node.containing_relation_members.uniq %>
       </ul>
     <% end %>
   </div>
diff --git a/app/views/browse/_relation.html.erb b/app/views/browse/_relation.html.erb
index 10046d0bb..1644228ae 100644
--- a/app/views/browse/_relation.html.erb
+++ b/app/views/browse/_relation.html.erb
@@ -17,7 +17,7 @@
 
     <% unless relation.containing_relation_members.empty? %>
       <h4><%= t'browse.part_of' %></h4>
-      <ul><%= render :partial => "containing_relation", :collection => relation.containing_relation_members %></ul>
+      <ul><%= render :partial => "containing_relation", :collection => relation.containing_relation_members.uniq %></ul>
     <% end %>
   </div>
 <% end %>
diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb
index fd419586f..aff405dde 100644
--- a/app/views/browse/_way.html.erb
+++ b/app/views/browse/_way.html.erb
@@ -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>