cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Link to details from way version pages

Browse source
This commit is contained in:
Anton Khorev 2024-01-17 21:36:48 +03:00
parent e119200c1f
commit a0a269b206
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/views/old_ways/show.html.erb
View file

@ -4,11 +4,13 @@
<%= render :partial => "browse/way", :object => @feature %> <%= render :partial => "browse/way", :object => @feature %>
<% unless @feature.redacted? %> <div class='secondary-actions'>
<div class='secondary-actions'> <% unless @feature.redacted? %>
<%= link_to t("browse.download_xml"), way_version_path(*@feature.id) %> <%= link_to t("browse.download_xml"), way_version_path(*@feature.id) %>
</div> &middot;
<% end %> <% end %>
<%= link_to t("browse.view_details"), way_path(@feature.way_id) %>
</div>
<div class='secondary-actions'> <div class='secondary-actions'>
<% if @feature.version > 1 %> <% if @feature.version > 1 %>

4
test/controllers/old_ways_controller_test.rb
View file

@ -18,6 +18,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest
assert_select "a[href='#{old_way_path way, 1}']", :count => 0 assert_select "a[href='#{old_way_path way, 1}']", :count => 0
end end
assert_select ".secondary-actions a[href='#{way_version_path way, 1}']", :count => 1 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='#{way_history_path way}']", :count => 1
end end
@ -31,6 +32,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest
assert_select "a[href='#{old_way_path way, 1}']", :count => 0 assert_select "a[href='#{old_way_path way, 1}']", :count => 0
end end
assert_select ".secondary-actions a[href='#{way_version_path way, 1}']", :count => 1 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='#{way_history_path way}']", :count => 1
assert_select ".secondary-actions a[href='#{old_way_path way, 2}']", :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 assert_select "a[href='#{old_way_path way, 2}']", :count => 0
end end
assert_select ".secondary-actions a[href='#{way_version_path way, 2}']", :count => 1 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='#{way_history_path way}']", :count => 1
assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 1 assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 1
end end
@ -68,6 +71,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest
assert_response :success assert_response :success
assert_template "old_ways/show" assert_template "old_ways/show"
assert_template :layout => "map" 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='#{old_way_path way, 1}']", :count => 0
assert_select ".secondary-actions a[href='#{way_version_path way, 1}']", :count => 0 assert_select ".secondary-actions a[href='#{way_version_path way, 1}']", :count => 0
end end