From: Tom Hughes <tom@compton.nu>
Date: Sat, 16 Mar 2024 11:32:34 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4582'
X-Git-Tag: live~1016
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c9880edac8451516131102943f377334e3f173ad?hp=606492c3df124092ed119716c5b1cbe922f6b315

Merge remote-tracking branch 'upstream/pull/4582'
---

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 53e980fdc..d3e8f10f9 100644
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,6 +1,6 @@
 module BrowseHelper
-  def element_single_current_link(type, object, url)
-    link_to url, { :class => element_class(type, object), :title => element_title(object), :rel => (link_follow(object) if type == "node") } do
+  def element_single_current_link(type, object)
+    link_to object, { :class => element_class(type, object), :title => element_title(object), :rel => (link_follow(object) if type == "node") } do
       element_strikethrough object do
         printable_element_name object
       end
diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb
index e395a4283..4e2ae0343 100644
--- a/app/views/browse/_node.html.erb
+++ b/app/views/browse/_node.html.erb
@@ -17,7 +17,7 @@
           <summary><%= t "browse.part_of_ways", :count => node.ways.uniq.count %></summary>
           <ul class="list-unstyled">
             <% node.ways.uniq.each do |way| %>
-              <li><%= element_single_current_link "way", way, way_path(way) %></li>
+              <li><%= element_single_current_link "way", way %></li>
             <% end %>
           </ul>
         </details>
diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb
index 19c5ff590..d015438fe 100644
--- a/app/views/browse/_way.html.erb
+++ b/app/views/browse/_way.html.erb
@@ -27,12 +27,12 @@
         <ul class="list-unstyled">
           <% way.way_nodes.each do |wn| %>
             <li>
-              <%= element_single_current_link "node", wn.node, node_path(wn.node) %>
+              <%= element_single_current_link "node", wn.node %>
               <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %>
               <% if related_ways.size > 0 then %>
                 (<%= t ".also_part_of_html",
                        :count => related_ways.size,
-                       :related_ways => to_sentence(related_ways.map { |w| element_single_current_link "way", w, way_path(w) }) %>)
+                       :related_ways => to_sentence(related_ways.map { |w| element_single_current_link "way", w }) %>)
               <% end %>
             </li>
           <% end %>