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

Link to previous/next versions from node version pages

Browse source
This commit is contained in:
Anton Khorev 2024-01-17 21:10:26 +03:00
parent 18899f2867
commit a39d997cf4
2 changed files with 42 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/views/old_nodes/show.html.erb
View file

@ -9,3 +9,15 @@
<%= link_to t("browse.download_xml"), node_version_path(*@feature.id) %> <%= link_to t("browse.download_xml"), node_version_path(*@feature.id) %>
</div> </div>
<% end %> <% end %>
<div class='secondary-actions'>
<% if @feature.version > 1 %>
<%= link_to "<< #{t('browse.version')} ##{@feature.version - 1}", old_node_path(@feature.node_id, @feature.version - 1) %>
&middot;
<% end %>
<%= link_to t("browse.view_history"), node_history_path(@feature.node_id) %>
<% if @feature.version < @feature.current_node.version %>
&middot;
<%= link_to "#{t('browse.version')} ##{@feature.version + 1} >>", old_node_path(@feature.node_id, @feature.version + 1) %>
<% end %>
</div>

34
test/controllers/old_nodes_controller_test.rb
View file

@ -8,7 +8,7 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest
) )
end end
def test_visible def test_visible_with_one_version
node = create(:node, :with_history) node = create(:node, :with_history)
get old_node_path(node, 1) get old_node_path(node, 1)
assert_response :success assert_response :success
@ -17,7 +17,33 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest
assert_select "h4", /^Version/ do assert_select "h4", /^Version/ do
assert_select "a[href='#{old_node_path node, 1}']", :count => 0 assert_select "a[href='#{old_node_path node, 1}']", :count => 0
end end
assert_select "a[href='#{node_version_path node, 1}']", :count => 1 assert_select ".secondary-actions a[href='#{node_version_path node, 1}']", :count => 1
assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1
end
def test_visible_with_two_versions
node = create(:node, :with_history, :version => 2)
get old_node_path(node, 1)
assert_response :success
assert_template "old_nodes/show"
assert_template :layout => "map"
assert_select "h4", /^Version/ do
assert_select "a[href='#{old_node_path node, 1}']", :count => 0
end
assert_select ".secondary-actions a[href='#{node_version_path node, 1}']", :count => 1
assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1
assert_select ".secondary-actions a[href='#{old_node_path node, 2}']", :count => 1
get old_node_path(node, 2)
assert_response :success
assert_template "old_nodes/show"
assert_template :layout => "map"
assert_select "h4", /^Version/ do
assert_select "a[href='#{old_node_path node, 2}']", :count => 0
end
assert_select ".secondary-actions a[href='#{node_version_path node, 2}']", :count => 1
assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1
assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 1
end end
def test_redacted def test_redacted
@ -28,8 +54,8 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest
assert_response :success assert_response :success
assert_template "old_nodes/show" assert_template "old_nodes/show"
assert_template :layout => "map" assert_template :layout => "map"
assert_select "a[href='#{old_node_path node, 1}']", :count => 0 assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 0
assert_select "a[href='#{node_version_path node, 1}']", :count => 0 assert_select ".secondary-actions a[href='#{node_version_path node, 1}']", :count => 0
end end
def test_not_found def test_not_found