From: Anton Khorev Date: Wed, 17 Jan 2024 18:41:09 +0000 (+0300) Subject: Link to details from relation version pages X-Git-Tag: live~307^2 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8f1ffeb5c8de75a6e1434986665808781ebcc22a Link to details from relation version pages --- diff --git a/app/views/old_relations/show.html.erb b/app/views/old_relations/show.html.erb index dd52b3833..29d0b0079 100644 --- a/app/views/old_relations/show.html.erb +++ b/app/views/old_relations/show.html.erb @@ -4,11 +4,13 @@ <%= render :partial => "browse/relation", :object => @feature %> -<% unless @feature.redacted? %> -
+
+ <% unless @feature.redacted? %> <%= link_to t("browse.download_xml"), relation_version_path(*@feature.id) %> -
-<% end %> + · + <% end %> + <%= link_to t("browse.view_details"), relation_path(@feature.relation_id) %> +
<% if @feature.version > 1 %> diff --git a/test/controllers/old_relations_controller_test.rb b/test/controllers/old_relations_controller_test.rb index 5b7a67bf0..311e5958a 100644 --- a/test/controllers/old_relations_controller_test.rb +++ b/test/controllers/old_relations_controller_test.rb @@ -18,6 +18,7 @@ class OldRelationsControllerTest < ActionDispatch::IntegrationTest 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_path relation}']", :count => 1 assert_select ".secondary-actions a[href='#{relation_history_path relation}']", :count => 1 end @@ -31,6 +32,7 @@ class OldRelationsControllerTest < ActionDispatch::IntegrationTest 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_path relation}']", :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 @@ -42,6 +44,7 @@ class OldRelationsControllerTest < ActionDispatch::IntegrationTest 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_path relation}']", :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 @@ -63,6 +66,7 @@ class OldRelationsControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template "old_relations/show" assert_template :layout => "map" + assert_select ".secondary-actions a[href='#{relation_path relation}']", :count => 1 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