From: Anton Khorev Date: Wed, 17 Jan 2024 18:36:48 +0000 (+0300) Subject: Link to details from way version pages X-Git-Tag: live~314^2~1 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a0a269b206ed1f1ca096b17eee35815091cdbfc5 Link to details from way version pages --- diff --git a/app/views/old_ways/show.html.erb b/app/views/old_ways/show.html.erb index d4e82b8a4..e9976dd78 100644 --- a/app/views/old_ways/show.html.erb +++ b/app/views/old_ways/show.html.erb @@ -4,11 +4,13 @@ <%= render :partial => "browse/way", :object => @feature %> -<% unless @feature.redacted? %> -
+
+ <% unless @feature.redacted? %> <%= link_to t("browse.download_xml"), way_version_path(*@feature.id) %> -
-<% end %> + · + <% end %> + <%= link_to t("browse.view_details"), way_path(@feature.way_id) %> +
<% if @feature.version > 1 %> diff --git a/test/controllers/old_ways_controller_test.rb b/test/controllers/old_ways_controller_test.rb index 3e1113475..d428605c5 100644 --- a/test/controllers/old_ways_controller_test.rb +++ b/test/controllers/old_ways_controller_test.rb @@ -18,6 +18,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest assert_select "a[href='#{old_way_path way, 1}']", :count => 0 end assert_select ".secondary-actions a[href='#{way_version_path way, 1}']", :count => 1 + assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1 assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1 end @@ -31,6 +32,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest assert_select "a[href='#{old_way_path way, 1}']", :count => 0 end assert_select ".secondary-actions a[href='#{way_version_path way, 1}']", :count => 1 + assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1 assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1 assert_select ".secondary-actions a[href='#{old_way_path way, 2}']", :count => 1 @@ -42,6 +44,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest assert_select "a[href='#{old_way_path way, 2}']", :count => 0 end assert_select ".secondary-actions a[href='#{way_version_path way, 2}']", :count => 1 + assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1 assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1 assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 1 end @@ -68,6 +71,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template "old_ways/show" assert_template :layout => "map" + assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1 assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 0 assert_select ".secondary-actions a[href='#{way_version_path way, 1}']", :count => 0 end