From bfc021edf3566982671bd2bd09db3c8667fc756a Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Wed, 17 Jan 2024 21:25:07 +0300 Subject: [PATCH] Link to previous/next versions from relation version pages --- app/views/old_relations/show.html.erb | 12 +++++++ .../old_relations_controller_test.rb | 34 ++++++++++++++++--- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/app/views/old_relations/show.html.erb b/app/views/old_relations/show.html.erb index cfa27c1ad..dd52b3833 100644 --- a/app/views/old_relations/show.html.erb +++ b/app/views/old_relations/show.html.erb @@ -9,3 +9,15 @@ <%= link_to t("browse.download_xml"), relation_version_path(*@feature.id) %> <% end %> + +
+ <% if @feature.version > 1 %> + <%= link_to "<< #{t('browse.version')} ##{@feature.version - 1}", old_relation_path(@feature.relation_id, @feature.version - 1) %> + · + <% end %> + <%= link_to t("browse.view_history"), relation_history_path(@feature.relation_id) %> + <% if @feature.version < @feature.current_relation.version %> + · + <%= link_to "#{t('browse.version')} ##{@feature.version + 1} >>", old_relation_path(@feature.relation_id, @feature.version + 1) %> + <% end %> +
diff --git a/test/controllers/old_relations_controller_test.rb b/test/controllers/old_relations_controller_test.rb index 87c4926ef..5b7a67bf0 100644 --- a/test/controllers/old_relations_controller_test.rb +++ b/test/controllers/old_relations_controller_test.rb @@ -8,7 +8,7 @@ class OldRelationsControllerTest < ActionDispatch::IntegrationTest ) end - def test_visible + def test_visible_with_one_version relation = create(:relation, :with_history) get old_relation_path(relation, 1) assert_response :success @@ -17,7 +17,33 @@ class OldRelationsControllerTest < ActionDispatch::IntegrationTest assert_select "h4", /^Version/ do assert_select "a[href='#{old_relation_path relation, 1}']", :count => 0 end - assert_select "a[href='#{relation_version_path relation, 1}']", :count => 1 + assert_select ".secondary-actions a[href='#{relation_version_path relation, 1}']", :count => 1 + assert_select ".secondary-actions a[href='#{relation_history_path relation}']", :count => 1 + end + + def test_visible_with_two_versions + relation = create(:relation, :with_history, :version => 2) + get old_relation_path(relation, 1) + assert_response :success + assert_template "old_relations/show" + assert_template :layout => "map" + assert_select "h4", /^Version/ do + assert_select "a[href='#{old_relation_path relation, 1}']", :count => 0 + end + assert_select ".secondary-actions a[href='#{relation_version_path relation, 1}']", :count => 1 + assert_select ".secondary-actions a[href='#{relation_history_path relation}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_relation_path relation, 2}']", :count => 1 + + get old_relation_path(relation, 2) + assert_response :success + assert_template "old_relations/show" + assert_template :layout => "map" + assert_select "h4", /^Version/ do + assert_select "a[href='#{old_relation_path relation, 2}']", :count => 0 + end + assert_select ".secondary-actions a[href='#{relation_version_path relation, 2}']", :count => 1 + assert_select ".secondary-actions a[href='#{relation_history_path relation}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 1 end def test_visible_with_members @@ -37,8 +63,8 @@ class OldRelationsControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template "old_relations/show" assert_template :layout => "map" - assert_select "a[href='#{old_relation_path relation, 1}']", :count => 0 - assert_select "a[href='#{relation_version_path relation, 1}']", :count => 0 + assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 0 + assert_select ".secondary-actions a[href='#{relation_version_path relation, 1}']", :count => 0 end def test_not_found -- 2.45.1