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 d4e82b8a46f16f863a16ae93dc7691fcaf66af3f..e9976dd78b435687778e916be925aa2a3d8007e5 100644 (file)
--- 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? %>
-  <div class='secondary-actions'>
+<div class='secondary-actions'>
+  <% unless @feature.redacted? %>
     <%= link_to t("browse.download_xml"), way_version_path(*@feature.id) %>
-  </div>
-<% end %>
+    &middot;
+  <% end %>
+  <%= link_to t("browse.view_details"), way_path(@feature.way_id) %>
+</div>
 
 <div class='secondary-actions'>
   <% if @feature.version > 1 %>

diff --git a/test/controllers/old_ways_controller_test.rb b/test/controllers/old_ways_controller_test.rb
index 3e1113475be713928211e27ec98ff46fc1a0cd82..d428605c51a0a9d9f4198f713675df7ef9ae9860 100644 (file)
--- 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